Mercurial > ecos

changeset 2090:4144fbf5b108

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* include/sys/time.h (Removed): Use the isoinfra sys/time.h * include/net/if.h: We do need sys/time.h for timeval. * src/sys/kern/uipc_socket.c: include sys/time.h for timeval * src/sys/kern/uipc_socket2.c: Ditto * src/sys/netinet6/in6_pcb.c (in6_pcbdetach): remove lvalue cast to keep gcc4.x happy.
author asl
date Sun, 23 Oct 2005 20:48:44 +0000
parents 0a3305f3af20
children 0c135c6d644c
files packages/net/bsd_tcpip/current/ChangeLog packages/net/bsd_tcpip/current/include/net/if.h packages/net/bsd_tcpip/current/include/sys/time.h packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket2.c packages/net/bsd_tcpip/current/src/sys/netinet6/in6_pcb.c packages/net/bsd_tcpip/current/src/sys/netinet6/ip6_mroute.c
diffstat 7 files changed, 17 insertions(+), 265 deletions(-) [+]
line wrap: on
line diff
--- a/packages/net/bsd_tcpip/current/ChangeLog
+++ b/packages/net/bsd_tcpip/current/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-23  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* include/sys/time.h (Removed): Use the isoinfra sys/time.h
+	* include/net/if.h: We do need sys/time.h for timeval.
+	* src/sys/kern/uipc_socket.c: include sys/time.h for timeval
+	* src/sys/kern/uipc_socket2.c: Ditto
+	* src/sys/netinet6/in6_pcb.c (in6_pcbdetach): remove lvalue cast
+	to keep gcc4.x happy.
+	
 2005-09-02  Sebastien Couret <sebastien.couret@elios-informatique.fr>
 
 	* src/sys/kern/kern_sysctl.c: Silent compiler warning on lvalue
--- a/packages/net/bsd_tcpip/current/include/net/if.h
+++ b/packages/net/bsd_tcpip/current/include/net/if.h
@@ -64,9 +64,13 @@
  * <net/if.h> does not depend on <sys/time.h> on most other systems.  This
  * helps userland compatability.  (struct timeval ifi_lastchange)
  */
+#ifndef __ECOS
 #ifndef _KERNEL
 #include <sys/time.h>
 #endif
+#else
+#include <sys/time.h>
+#endif
 
 struct ifnet;
 
deleted file mode 100644
--- a/packages/net/bsd_tcpip/current/include/sys/time.h
+++ /dev/null
@@ -1,263 +0,0 @@
-//==========================================================================
-//
-//      include/sys/time.h
-//
-//==========================================================================
-//####BSDCOPYRIGHTBEGIN####
-//
-// -------------------------------------------
-//
-// Portions of this software may have been derived from OpenBSD, 
-// FreeBSD or other sources, and are covered by the appropriate
-// copyright disclaimers included herein.
-//
-// Portions created by Red Hat are
-// Copyright (C) 2002 Red Hat, Inc. All Rights Reserved.
-//
-// -------------------------------------------
-//
-//####BSDCOPYRIGHTEND####
-//==========================================================================
-
-//==========================================================================
-//
-//      include/sys/time.h
-//
-//      
-//
-//==========================================================================
-//####BSDCOPYRIGHTBEGIN####
-//
-// -------------------------------------------
-//
-// Portions of this software may have been derived from OpenBSD or other sources,
-// and are covered by the appropriate copyright disclaimers included herein.
-//
-// -------------------------------------------
-//
-//####BSDCOPYRIGHTEND####
-//==========================================================================
-//#####DESCRIPTIONBEGIN####
-//
-// Author(s):    gthomas
-// Contributors: gthomas
-// Date:         2000-01-10
-// Purpose:      
-// Description:  
-//              
-//
-//####DESCRIPTIONEND####
-//
-//==========================================================================
-
-
-/*	$OpenBSD: time.h,v 1.9 1999/12/06 19:36:42 aaron Exp $	*/
-/*	$NetBSD: time.h,v 1.18 1996/04/23 10:29:33 mycroft Exp $	*/
-
-/*
- * Copyright (c) 1982, 1986, 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 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.
- *
- *	@(#)time.h	8.2 (Berkeley) 7/10/94
- */
-
-#ifndef _SYS_TIME_H_
-#define _SYS_TIME_H_
-
-#include <sys/types.h>
-#include <time.h>
-
-#if 0 //ndef __time_t_defined
-typedef int time_t;
-# define __time_t_defined
-#endif
-
-#if 0
-
-/*
- * Structure returned by gettimeofday(2) system call,
- * and used in other calls.
- */
-struct timeval {
-	long	tv_sec;		/* seconds */
-	long	tv_usec;	/* and microseconds */
-};
-
-#endif
-
-#if 0
-/*
- * Structure defined by POSIX.1b to be like a timeval.
- */
-struct timespec {
-	time_t	tv_sec;		/* seconds */
-	long	tv_nsec;	/* and nanoseconds */
-};
-#endif
-
-#define	TIMEVAL_TO_TIMESPEC(tv, ts) {					\
-	(ts)->tv_sec = (tv)->tv_sec;					\
-	(ts)->tv_nsec = (tv)->tv_usec * 1000;				\
-}
-#define	TIMESPEC_TO_TIMEVAL(tv, ts) {					\
-	(tv)->tv_sec = (ts)->tv_sec;					\
-	(tv)->tv_usec = (ts)->tv_nsec / 1000;				\
-}
-
-struct timezone {
-	int	tz_minuteswest;	/* minutes west of Greenwich */
-	int	tz_dsttime;	/* type of dst correction */
-};
-#define	DST_NONE	0	/* not on dst */
-#define	DST_USA		1	/* USA style dst */
-#define	DST_AUST	2	/* Australian style dst */
-#define	DST_WET		3	/* Western European dst */
-#define	DST_MET		4	/* Middle European dst */
-#define	DST_EET		5	/* Eastern European dst */
-#define	DST_CAN		6	/* Canada */
-
-/* Operations on timevals. */
-#define	timerclear(tvp)		(tvp)->tv_sec = (tvp)->tv_usec = 0
-#define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
-#define	timercmp(tvp, uvp, cmp)						\
-	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
-	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
-	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-#define	timeradd(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec >= 1000000) {			\
-			(vvp)->tv_sec++;				\
-			(vvp)->tv_usec -= 1000000;			\
-		}							\
-	} while (0)
-#define	timersub(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec < 0) {				\
-			(vvp)->tv_sec--;				\
-			(vvp)->tv_usec += 1000000;			\
-		}							\
-	} while (0)
-
-/* Operations on timespecs. */
-#define	timespecclear(tsp)		(tsp)->tv_sec = (tsp)->tv_nsec = 0
-#define	timespecisset(tsp)		((tsp)->tv_sec || (tsp)->tv_nsec)
-#define	timespeccmp(tsp, usp, cmp)					\
-	(((tsp)->tv_sec == (usp)->tv_sec) ?				\
-	    ((tsp)->tv_nsec cmp (usp)->tv_nsec) :			\
-	    ((tsp)->tv_sec cmp (usp)->tv_sec))
-#define	timespecadd(tsp, usp, vsp)					\
-	do {								\
-		(vsp)->tv_sec = (tsp)->tv_sec + (usp)->tv_sec;		\
-		(vsp)->tv_nsec = (tsp)->tv_nsec + (usp)->tv_nsec;	\
-		if ((vsp)->tv_nsec >= 1000000000L) {			\
-			(vsp)->tv_sec++;				\
-			(vsp)->tv_nsec -= 1000000000L;			\
-		}							\
-	} while (0)
-#define	timespecsub(tsp, usp, vsp)					\
-	do {								\
-		(vsp)->tv_sec = (tsp)->tv_sec - (usp)->tv_sec;		\
-		(vsp)->tv_nsec = (tsp)->tv_nsec - (usp)->tv_nsec;	\
-		if ((vsp)->tv_nsec < 0) {				\
-			(vsp)->tv_sec--;				\
-			(vsp)->tv_nsec += 1000000000L;			\
-		}							\
-	} while (0)
-
-/*
- * Names of the interval timers, and structure
- * defining a timer setting.
- */
-#define	ITIMER_REAL	0
-#define	ITIMER_VIRTUAL	1
-#define	ITIMER_PROF	2
-
-struct	itimerval {
-	struct	timeval it_interval;	/* timer interval */
-	struct	timeval it_value;	/* current value */
-};
-
-/*
- * Getkerninfo clock information structure
- */
-struct clockinfo {
-	int	hz;		/* clock frequency */
-	int	tick;		/* micro-seconds per hz tick */
-	int	tickadj;	/* clock skew rate for adjtime() */
-	int	stathz;		/* statistics clock frequency */
-	int	profhz;		/* profiling clock frequency */
-};
-
-#define CLOCK_REALTIME	0
-#define CLOCK_VIRTUAL	1
-#define CLOCK_PROF	2
-
-#define TIMER_RELTIME	0x0	/* relative timer */
-#ifndef TIMER_ABSTIME
-#define TIMER_ABSTIME	0x1	/* absolute timer */
-#endif
-
-#if defined(_KERNEL) || defined(_STANDALONE)
-int	itimerfix __P((struct timeval *tv));
-int	itimerdecr __P((struct itimerval *itp, int usec));
-void	microtime __P((struct timeval *tv));
-void	settime __P((struct timeval *tv));
-#else /* !_KERNEL */
-
-#ifndef __ECOS
-#include <time.h>
-#endif
-
-#if 0 //ndef _POSIX_SOURCE
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	adjtime __P((const struct timeval *, struct timeval *));
-int	clock_getres __P((clockid_t, struct timespec *));
-int	clock_gettime __P((clockid_t, struct timespec *));
-int	clock_settime __P((clockid_t, const struct timespec *));
-int	futimes __P((int, const struct timeval *));
-int	getitimer __P((int, struct itimerval *));
-int	gettimeofday __P((struct timeval *, struct timezone *));
-int	nanosleep __P((const struct timespec *, struct timespec *));
-int	setitimer __P((int, const struct itimerval *, struct itimerval *));
-int	settimeofday __P((const struct timeval *, const struct timezone *));
-int	utimes __P((const char *, const struct timeval *));
-__END_DECLS
-#endif /* !POSIX */
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_TIME_H_ */
--- a/packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c
+++ b/packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket.c
@@ -65,6 +65,7 @@
 #include <sys/socketvar.h>
 
 #include <cyg/io/file.h>
+#include <sys/time.h>
 
 #ifdef INET
 static int	 do_setopt_accept_filter(struct socket *so, struct sockopt *sopt);
--- a/packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket2.c
+++ b/packages/net/bsd_tcpip/current/src/sys/kern/uipc_socket2.c
@@ -64,6 +64,7 @@
 #include <sys/socketvar.h>
 
 #include <cyg/io/file.h>
+#include <sys/time.h>
 
 int	maxsockets = CYGPKG_NET_MAXSOCKETS;
 
--- a/packages/net/bsd_tcpip/current/src/sys/netinet6/in6_pcb.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet6/in6_pcb.c
@@ -586,7 +586,7 @@ in6_pcbdetach(inp)
 #endif /* IPSEC */
 	inp->inp_gencnt = ++ipi->ipi_gencnt;
 	in_pcbremlists(inp);
-	sotoinpcb(so) = 0;
+	so->so_pcb = 0;
 	sofree(so);
 
 	if (inp->in6p_inputopts) /* Free all received options. */
--- a/packages/net/bsd_tcpip/current/src/sys/netinet6/ip6_mroute.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet6/ip6_mroute.c
@@ -164,7 +164,7 @@ struct ifnet multicast_register_if;
 static mifi_t nummifs = 0;
 static mifi_t reg_mif_num = (mifi_t)-1;
 
-static struct pim6stat pim6stat;
+struct pim6stat pim6stat;
 static int pim6;
 
 /*