critical_enter/exit(): Use inline function

This commit is contained in:
Sebastian Huber 2014-09-29 08:38:09 +02:00
parent 6604dc893e
commit b8021fdcf6
4 changed files with 16 additions and 63 deletions

View File

@ -88,7 +88,6 @@ LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-rwlock.c
LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-shell.c
LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-shell-netcmds.c
LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-signal.c
LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-support.c
LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-sx.c
LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-syscall-api.c
LIB_C_FILES += rtemsbsd/rtems/rtems-bsd-sysctlbyname.c

View File

@ -686,7 +686,6 @@ rtems.addRTEMSSourceFiles(
'rtems/rtems-bsd-shell.c',
'rtems/rtems-bsd-shell-netcmds.c',
'rtems/rtems-bsd-signal.c',
'rtems/rtems-bsd-support.c',
'rtems/rtems-bsd-sx.c',
'rtems/rtems-bsd-syscall-api.c',
'rtems/rtems-bsd-sysctlbyname.c',

View File

@ -198,8 +198,24 @@ void panic(const char *, ...) __dead2 __printflike(1, 2);
void cpu_boot(int);
void cpu_flush_dcache(void *, size_t);
void cpu_rootconf(void);
#ifndef __rtems__
void critical_enter(void);
void critical_exit(void);
#else /* __rtems__ */
#include <rtems/score/threaddispatch.h>
static __inline void
critical_enter(void)
{
_Thread_Disable_dispatch();
}
static __inline void
critical_exit(void)
{
_Thread_Enable_dispatch();
}
#endif /* __rtems__ */
void init_param1(void);
void init_param2(long physpages);
void init_static_kenv(char *, size_t);

View File

@ -1,61 +0,0 @@
/**
* @file
*
* @ingroup rtems_bsd_rtems
*
* @brief TODO.
*/
/*
* Copyright (c) 2009, 2010 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Obere Lagerstr. 30
* 82178 Puchheim
* Germany
* <rtems@embedded-brains.de>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
/* FIXME: This file needs careful review. */
#include <machine/rtems-bsd-kernel-space.h>
#include <rtems/score/threaddispatch.h>
#include <rtems/bsd/sys/types.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/uio.h>
void
critical_enter(void)
{
_Thread_Disable_dispatch();
}
void
critical_exit(void)
{
_Thread_Enable_dispatch();
}