CVS commit: src/sys/dev/usb

[Mindaugas Rasiukevicius]

Module Name:    src
Committed By:   rmind
Date:           Sun Jun 12 03:26:20 UTC 2011

Modified Files:
        src/sys/dev/usb: ubsa.c usb_mem.c

Log Message:
Fix the build of ALL kernel (hi matt@).


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/usb/usb_mem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/usb/ubsa.c
diff -u src/sys/dev/usb/ubsa.c:1.26 src/sys/dev/usb/ubsa.c:1.27
--- src/sys/dev/usb/ubsa.c:1.26	Wed Nov  3 22:34:23 2010
+++ src/sys/dev/usb/ubsa.c	Sun Jun 12 03:26:20 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ubsa.c,v 1.26 2010/11/03 22:34:23 dyoung Exp $	*/
+/*	$NetBSD: ubsa.c,v 1.27 2011/06/12 03:26:20 rmind Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
  * All rights reserved.
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.26 2010/11/03 22:34:23 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.27 2011/06/12 03:26:20 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,7 +90,7 @@
 #include <dev/usb/ubsavar.h>
 
 #ifdef UBSA_DEBUG
-Static int	ubsadebug = 0;
+int		ubsadebug = 0;
 #ifdef __FreeBSD__
 SYSCTL_NODE(_hw_usb, OID_AUTO, ubsa, CTLFLAG_RW, 0, "USB ubsa");
 SYSCTL_INT(_hw_usb_ubsa, OID_AUTO, debug, CTLFLAG_RW,

Index: src/sys/dev/usb/usb_mem.c
diff -u src/sys/dev/usb/usb_mem.c:1.48 src/sys/dev/usb/usb_mem.c:1.49
--- src/sys/dev/usb/usb_mem.c:1.48	Thu Jun  9 19:08:32 2011
+++ src/sys/dev/usb/usb_mem.c	Sun Jun 12 03:26:20 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_mem.c,v 1.48 2011/06/09 19:08:32 matt Exp $	*/
+/*	$NetBSD: usb_mem.c,v 1.49 2011/06/12 03:26:20 rmind Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.48 2011/06/09 19:08:32 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.49 2011/06/12 03:26:20 rmind Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -130,7 +130,7 @@
 			splx(s);
 			*dmap = b;
 			DPRINTFN(6,("usb_block_allocmem: free list size=%zu\n",
-			    p->size));
+			    b->size));
 			return (USBD_NORMAL_COMPLETION);
 		}
 	}
@@ -208,7 +208,7 @@
 #endif
 
 #ifdef DEBUG
-Static bool
+static bool
 usb_valid_block_p(usb_dma_block_t *b, struct usb_dma_block_qh *qh)
 {
 	usb_dma_block_t *xb;