X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/1c79356b52d46aa6b508fb032f5ae709b1f2897b..6601e61aa18bf4f09af135ff61fc7f4771d23b06:/bsd/dev/i386/mem.c

diff --git a/bsd/dev/i386/mem.c b/bsd/dev/i386/mem.c
index 5c3422a64..892be2473 100644
--- a/bsd/dev/i386/mem.c
+++ b/bsd/dev/i386/mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -70,52 +70,67 @@
 #include <sys/param.h>
 #include <sys/dir.h>
 #include <sys/proc.h>
-#include <sys/buf.h>
 #include <sys/systm.h>
 #include <sys/vm.h>
-#include <sys/uio.h>
+#include <sys/uio_internal.h>
 #include <sys/malloc.h>
 
 #include <mach/vm_types.h>
 #include <mach/vm_param.h>
 #include <vm/vm_kern.h>		/* for kernel_map */
 
+extern vm_offset_t kvtophys(vm_offset_t va); 
+extern boolean_t kernacc(off_t, size_t );
+
 static caddr_t devzerobuf;
 
-mmread(dev, uio)
-	dev_t dev;
-	struct uio *uio;
+int mmread(dev_t dev, struct uio *uio);
+int mmwrite(dev_t dev, struct uio *uio);
+int mmioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p);
+int mmrw(dev_t dev, struct uio *uio, enum uio_rw rw);
+
+int
+mmread(dev_t dev, struct uio *uio)
 {
 
 	return (mmrw(dev, uio, UIO_READ));
 }
 
-mmwrite(dev, uio)
-	dev_t dev;
-	struct uio *uio;
+int
+mmwrite(dev_t dev, struct uio *uio)
 {
 
 	return (mmrw(dev, uio, UIO_WRITE));
 }
 
-mmrw(dev, uio, rw)
-	dev_t dev;
-	struct uio *uio;
-	enum uio_rw rw;
+int
+mmioctl(__unused dev_t dev, u_long cmd, __unused caddr_t data, 
+		__unused int flag, __unused struct proc *p)
+{
+	switch (cmd) {
+	case FIONBIO:
+	case FIOASYNC:
+		/* OK to do nothing: we always return immediately */
+		break;
+	default:
+		return ENODEV;
+	}
+
+	return (0);
+}
+
+int
+mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
 {
 	register int o;
 	register u_int c, v;
-	register struct iovec *iov;
 	int error = 0;
 	vm_offset_t	where;
-	int		spl;
 	vm_size_t size;
-	extern boolean_t kernacc(off_t, size_t );
 
-	while (uio->uio_resid > 0 && error == 0) {
-		iov = uio->uio_iov;
-		if (iov->iov_len == 0) {
-			uio->uio_iov++;
+	while (uio_resid(uio) > 0 && error == 0) {
+		if (uio_iov_len(uio) == 0) {
+			uio_next_iov(uio);
 			uio->uio_iovcnt--;
 			if (uio->uio_iovcnt < 0)
 				panic("mmrw");
@@ -135,7 +150,8 @@ mmrw(dev, uio, rw)
 				goto fault;
 			}
 			o = uio->uio_offset - v;
-			c = min(PAGE_SIZE - o, (u_int)iov->iov_len);
+			// LP64todo - fix this!
+			c = min(PAGE_SIZE - o, (u_int)uio_iov_len(uio));
 			error = uiomove((caddr_t) (where + o), c, uio);
 			kmem_free(kernel_map, where, PAGE_SIZE);
 			continue;
@@ -146,17 +162,18 @@ mmrw(dev, uio, rw)
 			if (((vm_address_t)uio->uio_offset >= VM_MAX_KERNEL_ADDRESS) ||
 				((vm_address_t)uio->uio_offset <= VM_MIN_KERNEL_ADDRESS))
 				goto fault;
-			c = iov->iov_len;
+			c = uio_iov_len(uio);
 			if (!kernacc(uio->uio_offset, c))
 				goto fault;
-			error = uiomove((caddr_t)uio->uio_offset, (int)c, uio);
+			error = uiomove((caddr_t)(uintptr_t)uio->uio_offset,
+					(int)c, uio);
 			continue;
 
 		/* minor device 2 is EOF/RATHOLE */
 		case 2:
 			if (rw == UIO_READ)
 				return (0);
-			c = iov->iov_len;
+			c = uio_iov_len(uio);
 			break;
 		case 3:
 			if(devzerobuf == NULL) {
@@ -164,10 +181,11 @@ mmrw(dev, uio, rw)
 				bzero(devzerobuf, PAGE_SIZE);
 			}
 			if(uio->uio_rw == UIO_WRITE) {
-				c = iov->iov_len;
+				c = uio_iov_len(uio);
 				break;
 			}
-			c = min(iov->iov_len, PAGE_SIZE);
+ 			// LP64todo - fix this!
+ 			c = min(uio_iov_len(uio), PAGE_SIZE);
 			error = uiomove(devzerobuf, (int)c, uio);
 			continue;
 		default:
@@ -177,10 +195,10 @@ mmrw(dev, uio, rw)
 			
 		if (error)
 			break;
-		iov->iov_base += c;
-		iov->iov_len -= c;
+		uio_iov_base_add(uio, c);
+		uio_iov_len_add(uio, -((int)c));
 		uio->uio_offset += c;
-		uio->uio_resid -= c;
+		uio_setresid(uio, (uio_resid(uio) - c));
 	}
 	return (error);
 fault:
@@ -201,7 +219,7 @@ kernacc(
 	end = start + len;
 	
 	while (base < end) {
-		if(kvtophys((vm_offset_t)base) == NULL)
+	  if(kvtophys((vm_offset_t)base) == 0ULL)
 			return(FALSE);
 		base += page_size;
 	}