Changeset 4cd742e in rtems


Ignore:
Timestamp:
Nov 2, 2015, 3:14:37 AM (4 years ago)
Author:
Ngie Cooper <ngie@…>
Branches:
master
Children:
65f2cd7a
Parents:
f013c14
git-author:
Ngie Cooper <ngie@…> (11/02/15 03:14:37)
git-committer:
Sebastian Huber <sebastian.huber@…> (10/12/17 05:04:10)
Message:

timecounter: Merge FreeBSD change r290257

Define fhard in pps_event(..) only when PPS_SYNC is defined to mute an -Wunused-but-set-variable warning

Reported by: FreeBSD_HEAD_amd64_gcc4.9 jenkins job
Sponsored by: EMC / Isilon Storage Division

Update #3175.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/score/src/kern_tc.c

    rf013c14 r4cd742e  
    19021902        struct timespec ts, *tsp, *osp;
    19031903        uint32_t tcount, *pcount;
    1904         int foff, fhard;
     1904        int foff;
    19051905        pps_seq_t *pseq;
    19061906#ifdef FFCLOCK
     
    19081908        pps_seq_t *pseq_ffc;
    19091909        ffcounter *ffcount;
     1910#endif
     1911#ifdef PPS_SYNC
     1912        int fhard;
    19101913#endif
    19111914
     
    19241927                osp = &pps->ppsparam.assert_offset;
    19251928                foff = pps->ppsparam.mode & PPS_OFFSETASSERT;
     1929#ifdef PPS_SYNC
    19261930                fhard = pps->kcmode & PPS_CAPTUREASSERT;
     1931#endif
    19271932                pcount = &pps->ppscount[0];
    19281933                pseq = &pps->ppsinfo.assert_sequence;
     
    19361941                osp = &pps->ppsparam.clear_offset;
    19371942                foff = pps->ppsparam.mode & PPS_OFFSETCLEAR;
     1943#ifdef PPS_SYNC
    19381944                fhard = pps->kcmode & PPS_CAPTURECLEAR;
     1945#endif
    19391946                pcount = &pps->ppscount[1];
    19401947                pseq = &pps->ppsinfo.clear_sequence;
Note: See TracChangeset for help on using the changeset viewer.