--- xnu/xnu-792.6.22/bsd/dev/random/randomdev.c
+++ xnu/xnu-517/bsd/dev/random/randomdev.c
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 1999-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999, 2000-2003 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -31,7 +34,6 @@
 #include <kern/lock.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
-#include <sys/uio_internal.h>
 
 #include <dev/random/randomdev.h>
 #include <dev/random/YarrowCoreLib/include/yarrow.h>
@@ -50,9 +52,9 @@
 	random_close,		/* close */
 	random_read,		/* read */
 	random_write,		/* write */
-	random_ioctl,		/* ioctl */
-	(stop_fcn_t *)nulldev, /* stop */
-	(reset_fcn_t *)nulldev, /* reset */
+	random_ioctl,			/* ioctl */
+	nulldev,			/* stop */
+	nulldev,			/* reset */
 	NULL,				/* tty's */
 	eno_select,			/* select */
 	eno_mmap,			/* mmap */
@@ -70,11 +72,10 @@
 
 #define RESEED_TICKS 50 /* how long a reseed operation can take */
 
-
 /*
  *Initialize ONLY the Yarrow generator.
  */
-void PreliminarySetup( void )
+void PreliminarySetup ()
 {
     prng_error_status perr;
     struct timeval tt;
@@ -122,7 +123,7 @@
  * and to register ourselves with devfs
  */
 void
-random_init( void )
+random_init()
 {
 	int ret;
 
@@ -154,8 +155,12 @@
 }
 
 int
-random_ioctl(	__unused dev_t dev, u_long cmd, __unused caddr_t data, 
-				__unused int flag, __unused struct proc *p  )
+random_ioctl(dev, cmd, data, flag, p)
+        dev_t dev;
+        u_long cmd;
+        caddr_t data;
+        int flag;
+        struct proc *p;
 {
 	switch (cmd) {
 	case FIONBIO:
@@ -174,7 +179,7 @@
  */
  
 int
-random_open(__unused dev_t dev, int flags, __unused int devtype, __unused struct proc *p)
+random_open(dev_t dev, int flags, int devtype, struct proc *p)
 {
 	if (gRandomError != 0) {
 		/* forget it, yarrow didn't come up */
@@ -189,7 +194,7 @@
 		if (securelevel >= 2)
 			return (EPERM);
 #ifndef __APPLE__
-		if ((securelevel >= 1) && proc_suser(p))
+		if ((securelevel >= 1) && suser(p->p_ucred, &p->p_acflag))
 			return (EPERM);
 #endif	/* !__APPLE__ */
 	}
@@ -203,7 +208,7 @@
  */
  
 int
-random_close(__unused dev_t dev, __unused int flags, __unused int mode, __unused struct proc *p)
+random_close(dev_t dev, int flags, int mode, struct proc *p)
 {
 	return (0);
 }
@@ -214,7 +219,7 @@
  * prng.
  */
 int
-random_write (__unused dev_t dev, struct uio *uio, __unused int ioflag)
+random_write (dev_t dev, struct uio *uio, int ioflag)
 {
     int retCode = 0;
     char rdBuffer[256];
@@ -228,10 +233,9 @@
     
     /* Security server is sending us entropy */
 
-    while (uio_resid(uio) > 0 && retCode == 0) {
+    while (uio->uio_resid > 0 && retCode == 0) {
         /* get the user's data */
-        // LP64todo - fix this!  uio_resid may be 64-bit value
-        int bytesToInput = min(uio_resid(uio), sizeof (rdBuffer));
+        int bytesToInput = min(uio->uio_resid, sizeof (rdBuffer));
         retCode = uiomove(rdBuffer, bytesToInput, uio);
         if (retCode != 0)
             goto /*ugh*/ error_exit;
@@ -262,7 +266,7 @@
  * return data to the caller.  Results unpredictable.
  */ 
 int
-random_read(__unused dev_t dev, struct uio *uio, __unused int ioflag)
+random_read(dev_t dev, struct uio *uio, int ioflag)
 {
     int retCode = 0;
     char wrBuffer[512];
@@ -273,10 +277,9 @@
    /* lock down the mutex */
     mutex_lock(gYarrowMutex);
 
-    while (uio_resid(uio) > 0 && retCode == 0) {
+    while (uio->uio_resid > 0 && retCode == 0) {
         /* get the user's data */
-        // LP64todo - fix this!  uio_resid may be 64-bit value
-        int bytesToRead = min(uio_resid(uio), sizeof (wrBuffer));
+        int bytesToRead = min(uio->uio_resid, sizeof (wrBuffer));
         
         /* get the data from Yarrow */
         if (prngOutput(gPrngRef, (BYTE *) wrBuffer, sizeof (wrBuffer)) != 0) {
@@ -317,7 +320,7 @@
  * Return an unsigned long pseudo-random number.
  */
 u_long
-RandomULong( void )
+RandomULong()
 {
 	u_long buf;
 	read_random(&buf, sizeof (buf));