diff options
author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2013-01-23 13:09:18 -0600 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2013-01-23 13:38:04 -0600 |
commit | bb679b31119f59a0c27609f606967b4ba326dae4 (patch) | |
tree | 0399d7023685910e5b697ea6aa7fc40fbcf957ec /cpukit/libnetworking | |
parent | bsp/gen83xx: Disable caches in bsp_restart() (diff) | |
download | rtems-bb679b31119f59a0c27609f606967b4ba326dae4.tar.bz2 |
Move <memory.h> and <sys/uio.h> to non-networking directory
These two header files were installed from libnetworking even
when networking was disabled. This patch moves them to a
non-networking location and updates uio.h to match the FreeBSD 8.x
source being used for the USB stack and TCP/IP stack upgrade.
- cpukit/include/memory.h
Move from cpukit/libnetworking/memory.h. No changes
- cpukit/include/sys/uio.h
Move from cpukit/libnetworking/sys/uio.h. Replace with FreeBSD 8.x version.
- cpukit/include/sys/_iovec.h
New. FreeBSD 8.x file supporting <sys/uio.h>.
- cpukit/Makefile.am
Reflect movement of <memory.h> and <sys/uio.h>.
- cpukit/preinstall.am
Regenerate
- cpukit/libnetworking/nfs/bootp_subr.c
Eliminate use of uio_procp field no longer in FreeBSD structure. This
field was set and never read so eliminating the set has no impact.
Diffstat (limited to 'cpukit/libnetworking')
-rw-r--r-- | cpukit/libnetworking/memory.h | 7 | ||||
-rw-r--r-- | cpukit/libnetworking/nfs/bootp_subr.c | 4 | ||||
-rw-r--r-- | cpukit/libnetworking/sys/uio.h | 99 |
3 files changed, 4 insertions, 106 deletions
diff --git a/cpukit/libnetworking/memory.h b/cpukit/libnetworking/memory.h deleted file mode 100644 index ee8bd4089e..0000000000 --- a/cpukit/libnetworking/memory.h +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @file - * - * @brief Dummy Include File for FreeBSD Routines - */ - -#include <string.h> diff --git a/cpukit/libnetworking/nfs/bootp_subr.c b/cpukit/libnetworking/nfs/bootp_subr.c index 0645b89431..911e322879 100644 --- a/cpukit/libnetworking/nfs/bootp_subr.c +++ b/cpukit/libnetworking/nfs/bootp_subr.c @@ -380,7 +380,9 @@ bootpc_call( auio.uio_rw = UIO_WRITE; auio.uio_offset = 0; auio.uio_resid = sizeof(*call); +#ifndef __rtems__ auio.uio_procp = procp; +#endif error = sosend(so, nam, &auio, NULL, NULL, 0); if (error) { printf("bootpc_call: sosend: %d\n", error); @@ -414,7 +416,9 @@ bootpc_call( auio.uio_rw = UIO_READ; auio.uio_offset = 0; auio.uio_resid = sizeof(*reply); +#ifndef __rtems__ auio.uio_procp = procp; +#endif rcvflg = 0; error = soreceive(so, NULL, &auio, NULL, NULL, &rcvflg); diff --git a/cpukit/libnetworking/sys/uio.h b/cpukit/libnetworking/sys/uio.h deleted file mode 100644 index 71e09a2792..0000000000 --- a/cpukit/libnetworking/sys/uio.h +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 1982, 1986, 1993, 1994 - * 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. - * - * @(#)uio.h 8.5 (Berkeley) 2/22/94 - * $FreeBSD: src/sys/sys/uio.h,v 1.40 2006/11/29 19:08:45 alfred Exp $ - */ - - -#ifndef _SYS_UIO_H_ -#define _SYS_UIO_H_ - -#include <sys/cdefs.h> -#include <sys/types.h> - -/* - * POSIX compliant iovec definition - */ -struct iovec { - void *iov_base; /* pointer to data to be written */ - size_t iov_len; /* length of this data block */ -}; - -#if __BSD_VISIBLE -enum uio_rw { UIO_READ, UIO_WRITE }; - -/* Segment flag values. */ -enum uio_seg { - UIO_USERSPACE, /* from user data space */ - UIO_SYSSPACE, /* from system space */ - UIO_NOCOPY /* don't copy, already in object */ -}; -#endif - -#ifdef _KERNEL - -struct uio { - struct iovec *uio_iov; /* scatter/gather list */ - int uio_iovcnt; /* length of scatter/gather list */ - off_t uio_offset; /* offset in target object */ - ssize_t uio_resid; /* remaining bytes to process */ - enum uio_seg uio_segflg; /* address space */ - enum uio_rw uio_rw; /* operation */ -#if !defined(__rtems__) - struct thread *uio_td; /* owner */ -#else - struct proc *uio_procp; -#endif /* !__rtems__ */ -}; - -/* - * Limits - * - * N.B.: UIO_MAXIOV must be no less than IOV_MAX from <sys/syslimits.h> - * which in turn must be no less than _XOPEN_IOV_MAX from <limits.h>. If - * we ever make this tunable (probably pointless), then IOV_MAX should be - * removed from <sys/syslimits.h> and applications would be expected to use - * sysconf(3) to find out the correct value, or else assume the worst - * (_XOPEN_IOV_MAX). Perhaps UIO_MAXIOV should be simply defined as - * IOV_MAX. - */ -#define UIO_MAXIOV 1024 /* max 1K of iov's */ - -int uiomove(void *cp, int n, struct uio *uio); - -#else /* !_KERNEL */ - -__BEGIN_DECLS -ssize_t readv(int, const struct iovec *, int); -ssize_t writev(int, const struct iovec *, int); -__END_DECLS - -#endif /* _KERNEL */ - -#endif /* !_SYS_UIO_H_ */ |