RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Partial update from FreeBSD.

Browse Source
This commit is contained in:
Ralf Corsepius
2009-02-11 13:21:10 +00:00
parent e2d78b0b27
commit b34eb570d3
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cpukit/libnetworking/kern/kern_subr.c
View File

@@ -70,7 +70,6 @@ uiomove(void *cp, int n, struct uio *uio)
switch (uio->uio_segflg) { switch (uio->uio_segflg) {
case UIO_USERSPACE: case UIO_USERSPACE:
case UIO_USERISPACE:
if (uio->uio_rw == UIO_READ) if (uio->uio_rw == UIO_READ)
error = copyout(cp, iov->iov_base, cnt); error = copyout(cp, iov->iov_base, cnt);
else else

19
cpukit/libnetworking/sys/uio.h
View File

@@ -27,7 +27,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)uio.h 8.5 (Berkeley) 2/22/94 * @(#)uio.h 8.5 (Berkeley) 2/22/94
* $FreeBSD: src/sys/sys/uio.h,v 1.38 2005/01/07 02:29:24 imp Exp $ * $FreeBSD: src/sys/sys/uio.h,v 1.40 2006/11/29 19:08:45 alfred Exp $
*/ */
/* /*
@@ -54,7 +54,6 @@ enum uio_rw { UIO_READ, UIO_WRITE };
enum uio_seg { enum uio_seg {
UIO_USERSPACE, /* from user data space */ UIO_USERSPACE, /* from user data space */
UIO_SYSSPACE, /* from system space */ UIO_SYSSPACE, /* from system space */
UIO_USERISPACE, /* from user I space */
UIO_NOCOPY /* don't copy, already in object */ UIO_NOCOPY /* don't copy, already in object */
}; };
#endif #endif
@@ -62,13 +61,17 @@ enum uio_seg {
#ifdef _KERNEL #ifdef _KERNEL
struct uio { struct uio {
struct iovec *uio_iov; struct iovec *uio_iov; /* scatter/gather list */
int uio_iovcnt; int uio_iovcnt; /* length of scatter/gather list */
off_t uio_offset; off_t uio_offset; /* offset in target object */
int uio_resid; int uio_resid; /* remaining bytes to process */
enum uio_seg uio_segflg; enum uio_seg uio_segflg; /* address space */
enum uio_rw uio_rw; enum uio_rw uio_rw; /* operation */
#if !defined(__rtems__)
struct thread *uio_td; /* owner */
#else
struct proc *uio_procp; struct proc *uio_procp;
#endif /* !__rtems__ */
}; };
/* /*