Fix pgsigio() warnings

4 files changed, 14 insertions, 52 deletions

diff --git a/freebsd/sys/sys/signalvar.h b/freebsd/sys/sys/signalvar.h
index 0a1413b5..aafbc0f8 100644
--- a/freebsd/sys/sys/signalvar.h
+++ b/freebsd/sys/sys/signalvar.h
@@ -401,7 +401,21 @@ void	trapsignal(struct thread *td, ksiginfo_t *ksi);
 
 #endif /* _KERNEL */
 #else /* __rtems__ */
+#ifdef _KERNEL
 typedef int ksiginfo_t;
+
+struct sigio;
+
+static __inline void
+pgsigio(struct sigio **sigiop, int sig, int checkctty)
+{
+
+	(void)sigiop;
+	(void)sig;
+	(void)checkctty;
+	BSD_ASSERT(0);
+}
+#endif /* _KERNEL */
 #endif /* __rtems__ */
 
 #endif /* !_SYS_SIGNALVAR_H_ */
diff --git a/libbsd.py b/libbsd.py
index 0f4ded0f..b3c95cb1 100644
--- a/libbsd.py
+++ b/libbsd.py
@@ -214,7 +214,6 @@ class rtems(builder.Module):
                 'rtems/rtems-kernel-pci_cfgreg.c',
                 'rtems/rtems-kernel-program.c',
                 'rtems/rtems-kernel-rwlock.c',
-                'rtems/rtems-kernel-signal.c',
                 'rtems/rtems-kernel-sx.c',
                 'rtems/rtems-kernel-sysctlbyname.c',
                 'rtems/rtems-kernel-sysctl.c',
diff --git a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
index 17ee381a..75b744a4 100644
--- a/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
+++ b/rtemsbsd/include/machine/rtems-bsd-kernel-namespace.h
@@ -3512,7 +3512,6 @@
 #define	pf_unload_vnet_purge _bsd_pf_unload_vnet_purge
 #define	pf_vnet_active _bsd_pf_vnet_active
 #define	pfxlist_onlink_check _bsd_pfxlist_onlink_check
-#define	pgsigio _bsd_pgsigio
 #define	phashinit _bsd_phashinit
 #define	phashinit_flags _bsd_phashinit_flags
 #define	pick_mode_by_dotclock _bsd_pick_mode_by_dotclock
diff --git a/rtemsbsd/rtems/rtems-kernel-signal.c b/rtemsbsd/rtems/rtems-kernel-signal.c
deleted file mode 100644
index 25a8a33b..00000000
--- a/rtemsbsd/rtems/rtems-kernel-signal.c
+++ /dev/null
@@ -1,50 +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.
- */
-
-#include <machine/rtems-bsd-kernel-space.h>
-
-#include <sys/types.h>
-#include <sys/systm.h>
-#include <sys/signalvar.h>
-
-void pgsigio(struct sigio **sigiop, int sig, int checkctty)
-{
- 
-	BSD_ASSERT(0);
-}