[rtems-libbsd commit] Use Newlib provided <sys/select.h>

Sebastian Huber sebh at rtems.org
Mon Jan 18 13:52:32 UTC 2016


Module:    rtems-libbsd
Branch:    master
Commit:    c2864c269b58cf84f2961e65349acf01c4ad6bc6
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=c2864c269b58cf84f2961e65349acf01c4ad6bc6

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Jan  8 08:17:38 2016 +0100

Use Newlib provided <sys/select.h>

---

 freebsd/sys/sys/_sigset.h |  59 ------------------------
 freebsd/sys/sys/select.h  | 114 ----------------------------------------------
 2 files changed, 173 deletions(-)

diff --git a/freebsd/sys/sys/_sigset.h b/freebsd/sys/sys/_sigset.h
deleted file mode 100644
index 0682670..0000000
--- a/freebsd/sys/sys/_sigset.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $FreeBSD$
- */
-
-#ifndef _SYS__SIGSET_H_
-#define	_SYS__SIGSET_H_
-
-/*
- * sigset_t macros.
- */
-#define	_SIG_WORDS	4
-#define	_SIG_MAXSIG	128
-#define	_SIG_IDX(sig)	((sig) - 1)
-#define	_SIG_WORD(sig)	(_SIG_IDX(sig) >> 5)
-#define	_SIG_BIT(sig)	(1 << (_SIG_IDX(sig) & 31))
-#define	_SIG_VALID(sig)	((sig) <= _SIG_MAXSIG && (sig) > 0)
-
-typedef struct __sigset {
-	__uint32_t __bits[_SIG_WORDS];
-} __sigset_t;
-
-#if defined(_KERNEL) && defined(COMPAT_43)
-typedef unsigned int osigset_t;
-#endif
-
-#endif /* !_SYS__SIGSET_H_ */
diff --git a/freebsd/sys/sys/select.h b/freebsd/sys/sys/select.h
deleted file mode 100644
index 6db6c37..0000000
--- a/freebsd/sys/sys/select.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * 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.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _SYS_SELECT_H_
-#define	_SYS_SELECT_H_
-
-#include <sys/cdefs.h>
-#include <rtems/bsd/sys/_types.h>
-
-#include <sys/_sigset.h>
-#include <sys/_timeval.h>
-#include <sys/timespec.h>
-
-#ifndef __rtems__
-typedef	unsigned long	__fd_mask;
-#if __BSD_VISIBLE
-typedef	__fd_mask	fd_mask;
-#endif
-
-#ifndef _SIGSET_T_DECLARED
-#define	_SIGSET_T_DECLARED
-typedef	__sigset_t	sigset_t;
-#endif
-
-/*
- * Select uses bit masks of file descriptors in longs.  These macros
- * manipulate such bit fields (the filesystem macros use chars).
- * FD_SETSIZE may be defined by the user, but the default here should
- * be enough for most uses.
- */
-#ifndef	FD_SETSIZE
-#define	FD_SETSIZE	1024U
-#endif
-
-#define	_NFDBITS	(sizeof(__fd_mask) * 8)	/* bits per mask */
-#if __BSD_VISIBLE
-#define	NFDBITS		_NFDBITS
-#endif
-
-#ifndef _howmany
-#define	_howmany(x, y)	(((x) + ((y) - 1)) / (y))
-#endif
-
-typedef	struct fd_set {
-	__fd_mask	__fds_bits[_howmany(FD_SETSIZE, _NFDBITS)];
-} fd_set;
-#if __BSD_VISIBLE
-#define	fds_bits	__fds_bits
-#endif
-
-#define	__fdset_mask(n)	((__fd_mask)1 << ((n) % _NFDBITS))
-#define	FD_CLR(n, p)	((p)->__fds_bits[(n)/_NFDBITS] &= ~__fdset_mask(n))
-#if __BSD_VISIBLE
-#define	FD_COPY(f, t)	(void)(*(t) = *(f))
-#endif
-#define	FD_ISSET(n, p)	(((p)->__fds_bits[(n)/_NFDBITS] & __fdset_mask(n)) != 0)
-#define	FD_SET(n, p)	((p)->__fds_bits[(n)/_NFDBITS] |= __fdset_mask(n))
-#define	FD_ZERO(p) do {					\
-	fd_set *_p;					\
-	__size_t _n;					\
-							\
-	_p = (p);					\
-	_n = _howmany(FD_SETSIZE, _NFDBITS);		\
-	while (_n > 0)					\
-		_p->__fds_bits[--_n] = 0;		\
-} while (0)
-#else /* __rtems__ */
-#include <rtems/bsd/sys/types.h>
-#include <rtems/bsd/sys/time.h>
-#include <sys/signal.h>
-#endif /* __rtems__ */
-
-#ifndef _KERNEL
-
-__BEGIN_DECLS
-int pselect(int, fd_set *__restrict, fd_set *__restrict, fd_set *__restrict,
-	const struct timespec *__restrict, const sigset_t *__restrict);
-#ifndef _SELECT_DECLARED
-#define	_SELECT_DECLARED
-/* XXX missing restrict type-qualifier */
-int	select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-#endif
-__END_DECLS
-#endif /* !_KERNEL */
-
-#endif /* _SYS_SELECT_H_ */



More information about the vc mailing list