Update due to header file changes

This commit is contained in:
Sebastian Huber 2013-09-20 15:01:27 +02:00
parent a3dde3ee78
commit 473437ccd7
6 changed files with 32 additions and 34 deletions

View File

@ -7,10 +7,9 @@
*/ */
/* /*
* Copyright (c) 2009, 2010 embedded brains GmbH. * Copyright (c) 2009-2013 embedded brains GmbH. All rights reserved.
* All rights reserved.
* *
* embedded brains GmbH * Dornierstr. 4
* Obere Lagerstr. 30 * Obere Lagerstr. 30
* 82178 Puchheim * 82178 Puchheim
* Germany * Germany
@ -38,12 +37,12 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
/* Necessary to obtain some internal functions */
#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
#include <freebsd/machine/rtems-bsd-config.h> #include <freebsd/machine/rtems-bsd-config.h>
#include <rtems/posix/cond.h> #include <rtems/score/objectimpl.h>
#include <rtems/score/threaddispatch.h>
#include <rtems/score/threadqimpl.h>
#include <rtems/posix/condimpl.h>
#include <freebsd/sys/param.h> #include <freebsd/sys/param.h>
#include <freebsd/sys/types.h> #include <freebsd/sys/types.h>
@ -109,7 +108,7 @@ static int _cv_wait_support(struct cv *cv, struct lock_object *lock, int timo, b
_Thread_Executing->Wait.id = cv->cv_id; _Thread_Executing->Wait.id = cv->cv_id;
/* FIXME: Integer conversion */ /* FIXME: Integer conversion */
_Thread_queue_Enqueue(&pcv->Wait_queue, (Watchdog_Interval) timo); _Thread_queue_Enqueue(&pcv->Wait_queue, _Thread_Executing, (Watchdog_Interval) timo);
DROP_GIANT(); DROP_GIANT();

View File

@ -7,10 +7,10 @@
*/ */
/* /*
* Copyright (c) 2009, 2010 embedded brains GmbH. All rights reserved. * Copyright (c) 2009-2013 embedded brains GmbH. All rights reserved.
* *
* embedded brains GmbH * embedded brains GmbH
* Obere Lagerstr. 30 * Dornierstr. 4
* 82178 Puchheim * 82178 Puchheim
* Germany * Germany
* <rtems@embedded-brains.de> * <rtems@embedded-brains.de>
@ -37,11 +37,12 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
/* Necessary to obtain some internal functions */
#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
#include <freebsd/machine/rtems-bsd-config.h> #include <freebsd/machine/rtems-bsd-config.h>
#include <rtems/score/objectimpl.h>
#include <rtems/rtems/attrimpl.h>
#include <rtems/rtems/semimpl.h>
#include <freebsd/sys/param.h> #include <freebsd/sys/param.h>
#include <freebsd/sys/types.h> #include <freebsd/sys/types.h>
#include <freebsd/sys/systm.h> #include <freebsd/sys/systm.h>

View File

@ -37,13 +37,13 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
/* Necessary to obtain some internal functions */
#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
#include <pthread.h> #include <pthread.h>
#include <rtems/posix/rwlock.h>
#include <freebsd/machine/rtems-bsd-config.h> #include <freebsd/machine/rtems-bsd-config.h>
#include <rtems/score/objectimpl.h>
#include <rtems/posix/rwlockimpl.h>
#include <sys/types.h> #include <sys/types.h>
#include <freebsd/sys/param.h> #include <freebsd/sys/param.h>
#include <freebsd/sys/types.h> #include <freebsd/sys/types.h>

View File

@ -37,14 +37,12 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
/* /* FIXME: This file needs careful review. */
* This violation is specifically for _Thread_Disable_dispatch
* and _Thread_Enable_dispatch. Use of the critical_enter()
* and critical_exit() routines should be reviewed.
*/
#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
#include <freebsd/machine/rtems-bsd-config.h> #include <freebsd/machine/rtems-bsd-config.h>
#include <rtems/score/threaddispatch.h>
#include <freebsd/sys/types.h> #include <freebsd/sys/types.h>
#include <freebsd/sys/systm.h> #include <freebsd/sys/systm.h>
#include <freebsd/sys/malloc.h> #include <freebsd/sys/malloc.h>

View File

@ -7,10 +7,10 @@
*/ */
/* /*
* Copyright (c) 2009, 2010 embedded brains GmbH. All rights reserved. * Copyright (c) 2009-2013 embedded brains GmbH. All rights reserved.
* *
* embedded brains GmbH * embedded brains GmbH
* Obere Lagerstr. 30 * Dornierstr. 4
* 82178 Puchheim * 82178 Puchheim
* Germany * Germany
* <rtems@embedded-brains.de> * <rtems@embedded-brains.de>
@ -37,11 +37,12 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
/* Necessary to obtain some internal functions */
#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
#include <freebsd/machine/rtems-bsd-config.h> #include <freebsd/machine/rtems-bsd-config.h>
#include <rtems/score/objectimpl.h>
#include <rtems/rtems/attrimpl.h>
#include <rtems/rtems/semimpl.h>
#include <freebsd/sys/param.h> #include <freebsd/sys/param.h>
#include <freebsd/sys/types.h> #include <freebsd/sys/types.h>
#include <freebsd/sys/systm.h> #include <freebsd/sys/systm.h>

View File

@ -38,16 +38,15 @@
*/ */
/* /*
* This violation is specifically for _Thread_Disable_dispatch * FIXME: This seems to be a completely broken implementation.
* and _Thread_Enable_dispatch. Use of the critical_enter()
* and critical_exit() routines should be reviewed.
*/ */
#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
#include <freebsd/machine/rtems-bsd-config.h> #include <freebsd/machine/rtems-bsd-config.h>
#include <rtems/score/states.h>
#include <rtems/score/statesimpl.h>
#include <rtems/score/threaddispatch.h>
#include <rtems/score/thread.h> #include <rtems/score/thread.h>
#include <rtems/score/threadq.h> #include <rtems/score/threadqimpl.h>
#include <freebsd/sys/param.h> #include <freebsd/sys/param.h>
#include <freebsd/sys/types.h> #include <freebsd/sys/types.h>
@ -169,7 +168,7 @@ sleep_queue_timedwait(void *wchan, int pri, int timeout, int catch)
executing->Wait.queue = &sq->queue; executing->Wait.queue = &sq->queue;
_ISR_Enable( level ); _ISR_Enable( level );
_Thread_queue_Enqueue( &sq->queue, timeout ); _Thread_queue_Enqueue( &sq->queue, executing, timeout );
_Thread_Enable_dispatch(); _Thread_Enable_dispatch();
return _Thread_Executing->Wait.return_code; return _Thread_Executing->Wait.return_code;
} }