Changeset b5b8116 in rtems


Ignore:
Timestamp:
Mar 7, 2015, 6:23:32 PM (4 years ago)
Author:
hselasky <hselasky@…>
Branches:
4.11, master
Children:
cb6fde65
Parents:
2ccd150d
git-author:
hselasky <hselasky@…> (03/07/15 18:23:32)
git-committer:
Sebastian Huber <sebastian.huber@…> (06/09/15 12:56:02)
Message:

timecounter: Synchronize with FreeBSD

Add mutex support to the pps_ioctl() API in the kernel.
Bump kernel version to reflect structure change.

PR: 196897
MFC after: 1 week

File:
1 edited

Legend:

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

    r2ccd150d rb5b8116  
    3737#endif /* __rtems__ */
    3838#include <sys/cdefs.h>
    39 __FBSDID("$FreeBSD r277406 2015-01-20T03:54:30Z$");
     39__FBSDID("$FreeBSD r279728 2015-03-07T18:23:32Z$");
    4040
    4141#include "opt_compat.h"
     
    4747#include <sys/kernel.h>
    4848#include <sys/limits.h>
    49 #else /* __rtems__ */
    50 #include <limits.h>
    51 #endif /* __rtems__ */
    52 #ifdef FFCLOCK
    5349#include <sys/lock.h>
    5450#include <sys/mutex.h>
    55 #endif
    56 #ifndef __rtems__
    5751#include <sys/sysctl.h>
    5852#include <sys/syslog.h>
     
    6761#endif /* __rtems__ */
    6862#ifdef __rtems__
     63#include <limits.h>
    6964#include <rtems.h>
    7065ISR_LOCK_DEFINE(static, _Timecounter_Lock, "Timecounter");
     
    16081603                while (aseq == pps->ppsinfo.assert_sequence &&
    16091604                    cseq == pps->ppsinfo.clear_sequence) {
    1610                         err = tsleep(pps, PCATCH, "ppsfch", timo);
     1605                        if (pps->mtx != NULL)
     1606                                err = msleep(pps, pps->mtx, PCATCH, "ppsfch", timo);
     1607                        else
     1608                                err = tsleep(pps, PCATCH, "ppsfch", timo);
    16111609                        if (err == EWOULDBLOCK && fapi->timeout.tv_sec == -1) {
    16121610                                continue;
Note: See TracChangeset for help on using the changeset viewer.