diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-04-17 09:44:39 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-04-17 11:27:45 +0200 |
| commit | 772eff79468ab68c6b2eb00af927bac8846a3528 (patch) | |
| tree | 42b37152936cf2b427d233d33da25200ccd128b6 | |
| parent | Fix legacy MCF548X FEC interface driver (diff) | |
| download | rtems-libbsd-772eff79468ab68c6b2eb00af927bac8846a3528.tar.bz2 | |
Update due to CORE mutex API changes
| -rw-r--r-- | rtemsbsd/rtems/rtems-bsd-mutex.c | 4 | ||||
| -rw-r--r-- | rtemsbsd/rtems/rtems-bsd-sx.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rtemsbsd/rtems/rtems-bsd-mutex.c b/rtemsbsd/rtems/rtems-bsd-mutex.c index 0a3c7fbd..c6daab0b 100644 --- a/rtemsbsd/rtems/rtems-bsd-mutex.c +++ b/rtemsbsd/rtems/rtems-bsd-mutex.c @@ -7,7 +7,7 @@ */ /* - * Copyright (c) 2009-2013 embedded brains GmbH. All rights reserved. + * Copyright (c) 2009-2014 embedded brains GmbH. All rights reserved. * * embedded brains GmbH * Dornierstr. 4 @@ -258,7 +258,7 @@ int mtx_owned(struct mtx *m) Semaphore_Control *sema = _Semaphore_Get(m->lock_object.lo_id, &location); if (location == OBJECTS_LOCAL && !_Attributes_Is_counting_semaphore(sema->attribute_set)) { - int owned = sema->Core_control.mutex.holder_id == rtems_task_self(); + int owned = sema->Core_control.mutex.holder == _Thread_Executing; _Thread_Enable_dispatch(); diff --git a/rtemsbsd/rtems/rtems-bsd-sx.c b/rtemsbsd/rtems/rtems-bsd-sx.c index 948297f9..b8bc336a 100644 --- a/rtemsbsd/rtems/rtems-bsd-sx.c +++ b/rtemsbsd/rtems/rtems-bsd-sx.c @@ -7,7 +7,7 @@ */ /* - * Copyright (c) 2009-2013 embedded brains GmbH. All rights reserved. + * Copyright (c) 2009-2014 embedded brains GmbH. All rights reserved. * * embedded brains GmbH * Dornierstr. 4 @@ -343,7 +343,7 @@ sx_xlocked(struct sx *sx) Semaphore_Control *sema = _Semaphore_Get(sx->lock_object.lo_id, &location); if (location == OBJECTS_LOCAL && !_Attributes_Is_counting_semaphore(sema->attribute_set)) { - int xlocked = sema->Core_control.mutex.holder_id == rtems_task_self(); + int xlocked = sema->Core_control.mutex.holder == _Thread_Executing; _Thread_Enable_dispatch(); |