Index: sys/dev/firmload.h
===================================================================
RCS file: /data/netbsd/cvsroot/src/sys/dev/firmload.h,v
retrieving revision 1.1
diff -u -r1.1 firmload.h
--- sys/dev/firmload.h	17 Jan 2006 06:08:49 -0000	1.1
+++ sys/dev/firmload.h	13 Jul 2007 00:38:21 -0000
@@ -44,7 +44,7 @@
 int	firmware_open(const char *, const char *, firmware_handle_t *);
 int	firmware_close(firmware_handle_t);
 
-off_t	firmware_get_size(firmware_handle_t);
+size_t	firmware_get_size(firmware_handle_t);
 
 int	firmware_read(firmware_handle_t, off_t, void *, size_t);
 
Index: sys/dev/firmload.c
===================================================================
RCS file: /data/netbsd/cvsroot/src/sys/dev/firmload.c,v
retrieving revision 1.7
diff -u -r1.7 firmload.c
--- sys/dev/firmload.c	14 Jan 2007 10:56:34 -0000	1.7
+++ sys/dev/firmload.c	13 Jul 2007 00:38:01 -0000
@@ -60,7 +60,7 @@
 
 struct firmware_handle {
 	struct vnode	*fh_vp;
-	off_t		 fh_size;
+	size_t		 fh_size;
 };
 
 static firmware_handle_t
@@ -284,7 +284,7 @@
 	/* XXX Mark as busy text file. */
 
 	fh->fh_vp = vp;
-	fh->fh_size = va.va_size;
+	fh->fh_size = (size_t)va.va_size;
 
 	VOP_UNLOCK(vp, 0);
 
@@ -312,7 +312,7 @@
  *
  *	Return the total size of a firmware image.
  */
-off_t
+size_t
 firmware_get_size(firmware_handle_t fh)
 {
 
Index: sys/kern/vfs_vnops.c
===================================================================
RCS file: /data/netbsd/cvsroot/src/sys/kern/vfs_vnops.c,v
retrieving revision 1.139
diff -u -r1.139 vfs_vnops.c
--- sys/kern/vfs_vnops.c	19 May 2007 22:11:24 -0000	1.139
+++ sys/kern/vfs_vnops.c	13 Jul 2007 00:39:48 -0000
@@ -287,7 +287,7 @@
  * Package up an I/O request on a vnode into a uio and do it.
  */
 int
-vn_rdwr(enum uio_rw rw, struct vnode *vp, void *base, int len, off_t offset,
+vn_rdwr(enum uio_rw rw, struct vnode *vp, void *base, size_t len, off_t offset,
     enum uio_seg segflg, int ioflg, kauth_cred_t cred, size_t *aresid,
     struct lwp *l)
 {
Index: sys/sys/vnode.h
===================================================================
RCS file: /data/netbsd/cvsroot/src/sys/sys/vnode.h,v
retrieving revision 1.170
diff -u -r1.170 vnode.h
--- sys/sys/vnode.h	29 Jun 2007 23:30:32 -0000	1.170
+++ sys/sys/vnode.h	13 Jul 2007 00:41:02 -0000
@@ -544,8 +544,8 @@
 void	vn_markexec(struct vnode *);
 int	vn_marktext(struct vnode *);
 int 	vn_open(struct nameidata *, int, int);
-int 	vn_rdwr(enum uio_rw, struct vnode *, void *, int, off_t, enum uio_seg,
-    int, kauth_cred_t, size_t *, struct lwp *);
+int 	vn_rdwr(enum uio_rw, struct vnode *, void *, size_t, off_t,
+    enum uio_seg, int, kauth_cred_t, size_t *, struct lwp *);
 int	vn_readdir(struct file *, char *, int, u_int, int *, struct lwp *,
     off_t **, int *);
 void	vn_restorerecurse(struct vnode *, u_int);
Index: sys/dev/bluetooth/btuart.c
===================================================================
RCS file: /data/netbsd/cvsroot/src/sys/dev/bluetooth/btuart.c,v
retrieving revision 1.5
diff -u -r1.5 btuart.c
--- sys/dev/bluetooth/btuart.c	13 Mar 2007 19:26:06 -0000	1.5
+++ sys/dev/bluetooth/btuart.c	13 Jul 2007 00:42:28 -0000
@@ -300,8 +300,9 @@
 {
 	const cfdriver_t cd = device_cfdriver(&sc->sc_dev);
 	firmware_handle_t fh = NULL;
-	int error, size;
+	int error;
 	char *buf;
+	size_t size;
 
 	if ((error = firmware_open(cd->cd_name, filename, &fh)) != 0) {
 		printf("firmware_open failed\n");
Index: sys/dev/pci/if_iwi.c
===================================================================
RCS file: /data/netbsd/cvsroot/src/sys/dev/pci/if_iwi.c,v
retrieving revision 1.62
diff -u -r1.62 if_iwi.c
--- sys/dev/pci/if_iwi.c	4 Mar 2007 19:14:25 -0000	1.62
+++ sys/dev/pci/if_iwi.c	13 Jul 2007 00:52:22 -0000
@@ -2255,7 +2255,7 @@
 	struct iwi_firmware *kfw = &sc->fw;
 	firmware_handle_t fwh;
 	const struct iwi_firmware_hdr *hdr;
-	off_t size;	
+	size_t size;	
 	char *fw;
 	int error;
 
Index: sys/dev/pci/if_wpi.c
===================================================================
RCS file: /data/netbsd/cvsroot/src/sys/dev/pci/if_wpi.c,v
retrieving revision 1.11
diff -u -r1.11 if_wpi.c
--- sys/dev/pci/if_wpi.c	4 Jul 2007 23:18:49 -0000	1.11
+++ sys/dev/pci/if_wpi.c	13 Jul 2007 01:02:16 -0000
@@ -2632,8 +2632,7 @@
 	const char *boot, *text, *data;
 	firmware_handle_t fw;
 	u_char *dfw;
-	off_t size;
-	size_t wsize;
+	size_t wsize, size;
 	uint32_t tmp;
 	int qid, ntries, error;
 
Index: sys/dev/pcmcia/bt3c.c
===================================================================
RCS file: /data/netbsd/cvsroot/src/sys/dev/pcmcia/bt3c.c,v
retrieving revision 1.9
diff -u -r1.9 bt3c.c
--- sys/dev/pcmcia/bt3c.c	27 Dec 2006 22:07:17 -0000	1.9
+++ sys/dev/pcmcia/bt3c.c	13 Jul 2007 00:56:05 -0000
@@ -567,7 +567,7 @@
 		return err;
 	}
 
-	size = (size_t)firmware_get_size(fh);
+	size = firmware_get_size(fh);
 #ifdef DIAGNOSTIC
 	if (size > 10 * 1024) {	/* sanity check */
 		printf("%s: firmware file seems WAY too big!\n",
Index: sys/dev/usb/stuirda.c
===================================================================
RCS file: /data/netbsd/cvsroot/src/sys/dev/usb/stuirda.c,v
retrieving revision 1.2
diff -u -r1.2 stuirda.c
--- sys/dev/usb/stuirda.c	11 May 2007 13:12:14 -0000	1.2
+++ sys/dev/usb/stuirda.c	13 Jul 2007 01:03:11 -0000
@@ -137,7 +137,7 @@
 
 	int rc;
 	firmware_handle_t fh;
-	off_t fwsize;
+	size_t fwsize;
 	usb_device_descriptor_t usbddsc;
 	usbd_xfer_handle	fwxfer;
 	usbd_pipe_handle	fwpipe;
@@ -176,13 +176,12 @@
 	if (rc) {
 		printf("%s: Cannot load firmware\n",
 			USBDEVNAME(sc->sc_dev));
-		return 0;
 		return rc;
 	}
 	fwsize = firmware_get_size(fh);
 
-	printf("%s: Firmware size %lld\n",
-		USBDEVNAME(sc->sc_dev), (long long)fwsize);
+	printf("%s: Firmware size %d\n",
+		USBDEVNAME(sc->sc_dev), fwsize);
 
 	buffer = firmware_malloc(fwsize);
 	if (buffer == NULL) {
@@ -191,7 +190,7 @@
 		goto giveup2;
 	}
 
-	rc = firmware_read(fh, 0, buffer, (size_t)fwsize);
+	rc = firmware_read(fh, 0, buffer, fwsize);
 
 	if (rc) {
 		printf("%s: Cannot read firmware\n", USBDEVNAME(sc->sc_dev));
@@ -272,7 +271,6 @@
 	giveup2: firmware_close(fh);
 
 	return rc;
-		
 }
 
 int
Index: share/man/man9/vnsubr.9
===================================================================
RCS file: /data/netbsd/cvsroot/src/share/man/man9/vnsubr.9,v
retrieving revision 1.30
diff -u -r1.30 vnsubr.9
--- share/man/man9/vnsubr.9	7 Mar 2007 00:41:18 -0000	1.30
+++ share/man/man9/vnsubr.9	13 Jul 2007 01:05:48 -0000
@@ -82,7 +82,7 @@
 .Ft int
 .Fo vn_rdwr
 .Fa "enum uio_rw rw" "struct vnode *vp" "void *base"
-.Fa "int len" "off_t offset" "enum uio_seg segflg" "int ioflg"
+.Fa "size_t len" "off_t offset" "enum uio_seg segflg" "int ioflg"
 .Fa "kauth_cred_t cred" "size_t *aresid" "struct lwp *l"
 .Fc
 .Ft int
Index: share/man/man9/firmload.9
===================================================================
RCS file: /data/netbsd/cvsroot/src/share/man/man9/firmload.9,v
retrieving revision 1.3
diff -u -r1.3 firmload.9
--- share/man/man9/firmload.9	21 Jan 2006 23:33:21 -0000	1.3
+++ share/man/man9/firmload.9	13 Jul 2007 01:12:34 -0000
@@ -50,7 +50,7 @@
 .Ft int
 .Fn "firmware_close" "firmware_handle_t fh"
 .\"
-.Ft off_t
+.Ft size_t
 .Fn "firmware_get_size" "firmware_handle_t fh"
 .\"
 .Ft int