RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

timecounter: Merge FreeBSD change r279728

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

PR:		196897
MFC after:	1 week

Update #3175.
This commit is contained in:
Hans Petter Selasky
2015-03-07 18:23:32 +00:00
committed by Sebastian Huber
parent ed9a6fd8ac
commit ea0b339bbc
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/score/include/sys/timepps.h
View File

@@ -133,6 +133,8 @@ struct pps_kcbind_args {
#ifdef _KERNEL
struct mtx;
struct pps_state {
/* Capture information. */
struct timehands *capth;
@@ -140,6 +142,9 @@ struct pps_state {
unsigned capgen;
unsigned capcount;
/* pointer to mutex protecting this state, if any */
struct mtx *mtx;
/* State information. */
pps_params_t ppsparam;
pps_info_t ppsinfo;

14
cpukit/score/src/kern_tc.c
View File

@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD r284178 2015-06-09T11:49:56Z$");
#include <sys/limits.h>
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/sbuf.h>
#include <sys/sysctl.h>
#include <sys/syslog.h>
#include <sys/systm.h>
@@ -1713,17 +1712,10 @@ pps_fetch(struct pps_fetch_args *fapi, struct pps_state *pps)
cseq = pps->ppsinfo.clear_sequence;
while (aseq == pps->ppsinfo.assert_sequence &&
cseq == pps->ppsinfo.clear_sequence) {
if (abi_aware(pps, 1) && pps->driver_mtx != NULL) {
if (pps->flags & PPSFLAG_MTX_SPIN) {
err = msleep_spin(pps, pps->driver_mtx,
"ppsfch", timo);
} else {
err = msleep(pps, pps->driver_mtx, PCATCH,
"ppsfch", timo);
}
} else {
if (pps->mtx != NULL)
err = msleep(pps, pps->mtx, PCATCH, "ppsfch", timo);
else
err = tsleep(pps, PCATCH, "ppsfch", timo);
}
if (err == EWOULDBLOCK && fapi->timeout.tv_sec == -1) {
continue;
} else if (err != 0) {