mirror of
https://git.rtems.org/rtems-libbsd/
synced 2025-10-17 09:22:15 +08:00
Update to FreeBSD head 2017-12-01
Git mirror commit e724f51f811a4b2bd29447f8b85ab5c2f9b88266. Update #3472.
This commit is contained in:
@@ -119,17 +119,10 @@ rw_destroy(struct rwlock *rw)
|
||||
void
|
||||
rw_sysinit(void *arg)
|
||||
{
|
||||
struct rw_args *args = arg;
|
||||
struct rw_args *args;
|
||||
|
||||
rw_init(args->ra_rw, args->ra_desc);
|
||||
}
|
||||
|
||||
void
|
||||
rw_sysinit_flags(void *arg)
|
||||
{
|
||||
struct rw_args_flags *args = arg;
|
||||
|
||||
rw_init_flags(args->ra_rw, args->ra_desc, args->ra_flags);
|
||||
args = arg;
|
||||
rw_init(args->ra_rw, args->ra_desc);
|
||||
}
|
||||
|
||||
int
|
||||
|
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2009-2015 embedded brains GmbH. All rights reserved.
|
||||
* Copyright (c) 2009, 2018 embedded brains GmbH. All rights reserved.
|
||||
*
|
||||
* embedded brains GmbH
|
||||
* Dornierstr. 4
|
||||
@@ -114,34 +114,38 @@ sx_destroy(struct sx *sx)
|
||||
}
|
||||
|
||||
int
|
||||
_sx_xlock(struct sx *sx, int opts, const char *file, int line)
|
||||
_sx_slock_int(struct sx *sx, int opts LOCK_FILE_LINE_ARG_DEF)
|
||||
{
|
||||
rtems_bsd_mutex_lock(&sx->lock_object, &sx->mutex);
|
||||
|
||||
rtems_bsd_mutex_lock(&sx->lock_object, &sx->mutex);
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
sx_try_xlock_(struct sx *sx, const char *file, int line)
|
||||
sx_try_slock_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF)
|
||||
{
|
||||
|
||||
return (rtems_bsd_mutex_trylock(&sx->lock_object, &sx->mutex));
|
||||
}
|
||||
|
||||
void
|
||||
_sx_xunlock(struct sx *sx, const char *file, int line)
|
||||
_sx_sunlock_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF)
|
||||
{
|
||||
|
||||
rtems_bsd_mutex_unlock(&sx->mutex);
|
||||
}
|
||||
|
||||
int
|
||||
sx_try_upgrade_(struct sx *sx, const char *file, int line)
|
||||
sx_try_upgrade_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF)
|
||||
{
|
||||
|
||||
return (1);
|
||||
}
|
||||
|
||||
void
|
||||
sx_downgrade_(struct sx *sx, const char *file, int line)
|
||||
sx_downgrade_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF)
|
||||
{
|
||||
|
||||
/* Do nothing */
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user