Move content to new <machine/rtems-bsd-support.h>

This commit is contained in:
Sebastian Huber 2013-10-24 11:11:32 +02:00
parent de3ef24a03
commit 150d4d6524
13 changed files with 83 additions and 26 deletions

View File

@ -196,7 +196,7 @@ module_register(const moduledata_t *data, linker_file_t container)
TAILQ_INSERT_TAIL(&container->modules, newmod, flink);
newmod->file = container;
#else /* __rtems__ */
BSD_PANIC("not supported");
BSD_ASSERT(0);
#endif /* __rtems__ */
MOD_XUNLOCK;
return (0);

View File

@ -96,24 +96,16 @@
#include <machine/rtems-bsd-symbols.h>
/* Debug */
/* Assert */
void rtems_bsd_assert_func(const char *file, int line, const char *func, const char *expr);
#define BSD_PRINTF(fmt, ...) printf("%s: " fmt, __func__, ##__VA_ARGS__)
#define BSD_PANIC(fmt, ...) panic("%s: " fmt "\n", __func__, ##__VA_ARGS__)
#ifdef NDEBUG
#ifdef RTEMS_BSD_NO_ASSERT
# define BSD_ASSERT(expr) ((void) 0)
#else
# define BSD_ASSERT(expr) ((expr) ? (void) 0 : rtems_bsd_assert_func(__FILE__, __LINE__, __func__, #expr))
#endif
#define BSD_ASSERT_SC(sc) BSD_ASSERT((sc) == RTEMS_SUCCESSFUL)
#define BSD_ASSERT_RV(rv) BSD_ASSERT((rv) == 0)
/* General definitions */
#define M_RTEMS_HEAP 0
@ -128,16 +120,4 @@ void rtems_bsd_assert_func(const char *file, int line, const char *func, const c
#define BSD_DEFAULT_PRISON (&prison0)
extern rtems_chain_control rtems_bsd_lock_chain;
extern rtems_chain_control rtems_bsd_mtx_chain;
extern rtems_chain_control rtems_bsd_sx_chain;
extern rtems_chain_control rtems_bsd_condvar_chain;
extern rtems_chain_control rtems_bsd_callout_chain;
extern rtems_chain_control rtems_bsd_malloc_chain;
#endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_CONFIG_H_ */

View File

@ -0,0 +1,69 @@
/**
* @file
*
* @ingroup rtems_bsd_machine
*
* @brief TODO.
*/
/*
* Copyright (c) 2009-2013 embedded brains GmbH. All rights reserved.
*
* embedded brains GmbH
* Dornierstr. 4
* 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.
*/
#ifndef _RTEMS_BSD_MACHINE_RTEMS_BSD_SUPPORT_H_
#define _RTEMS_BSD_MACHINE_RTEMS_BSD_SUPPORT_H_
#include <stdio.h>
#include <rtems/chain.h>
/* Debug */
#define BSD_PRINTF(fmt, ...) printf("%s: " fmt, __func__, ##__VA_ARGS__)
#define BSD_PANIC(fmt, ...) panic("%s: " fmt "\n", __func__, ##__VA_ARGS__)
#define BSD_ASSERT_SC(sc) BSD_ASSERT((sc) == RTEMS_SUCCESSFUL)
#define BSD_ASSERT_RV(rv) BSD_ASSERT((rv) == 0)
extern rtems_chain_control rtems_bsd_lock_chain;
extern rtems_chain_control rtems_bsd_mtx_chain;
extern rtems_chain_control rtems_bsd_sx_chain;
extern rtems_chain_control rtems_bsd_condvar_chain;
extern rtems_chain_control rtems_bsd_callout_chain;
extern rtems_chain_control rtems_bsd_malloc_chain;
#endif /* _RTEMS_BSD_MACHINE_RTEMS_BSD_SUPPORT_H_ */

View File

@ -39,6 +39,7 @@
*/
#include <machine/rtems-bsd-config.h>
#include <machine/rtems-bsd-support.h>
#include <rtems/bsd/sys/param.h>
#include <sys/systm.h>

View File

@ -38,6 +38,7 @@
*/
#include <machine/rtems-bsd-config.h>
#include <machine/rtems-bsd-support.h>
#include <rtems/score/objectimpl.h>
#include <rtems/score/threaddispatch.h>

View File

@ -59,5 +59,5 @@ DELAY(int usec)
}
sc = rtems_task_wake_after(ticks);
BSD_ASSERT_SC(sc);
BSD_ASSERT(sc == RTEMS_SUCCESSFUL);
}

View File

@ -38,6 +38,7 @@
*/
#include <machine/rtems-bsd-config.h>
#include <machine/rtems-bsd-support.h>
#include <rtems/bsd/sys/param.h>
#include <rtems/bsd/sys/types.h>

View File

@ -39,6 +39,7 @@
#include <machine/rtems-bsd-config.h>
#include <machine/rtems-bsd-thread.h>
#include <machine/rtems-bsd-support.h>
#include <rtems/score/objectimpl.h>
#include <rtems/rtems/attrimpl.h>

View File

@ -38,6 +38,7 @@
*/
#include <machine/rtems-bsd-config.h>
#include <machine/rtems-bsd-support.h>
#include <rtems/score/objectimpl.h>
#include <rtems/posix/rwlockimpl.h>

View File

@ -39,6 +39,7 @@
#include <machine/rtems-bsd-config.h>
#include <machine/rtems-bsd-thread.h>
#include <machine/rtems-bsd-support.h>
#include <rtems/bsd/sys/param.h>
#include <rtems/bsd/sys/types.h>

View File

@ -46,11 +46,11 @@
void
psignal(struct proc *p, int sig)
{
BSD_PANIC("not implemented");
BSD_ASSERT(0);
}
void pgsigio(struct sigio **sigiop, int sig, int checkctty)
{
BSD_PANIC("not implemented");
BSD_ASSERT(0);
}

View File

@ -38,6 +38,7 @@
*/
#include <machine/rtems-bsd-config.h>
#include <machine/rtems-bsd-support.h>
#include <rtems/score/objectimpl.h>
#include <rtems/rtems/attrimpl.h>

View File

@ -39,6 +39,7 @@
#include <machine/rtems-bsd-config.h>
#include <machine/rtems-bsd-thread.h>
#include <machine/rtems-bsd-support.h>
#include <rtems/bsd/sys/param.h>
#include <rtems/bsd/sys/types.h>