 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -44,27 +44,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #ifdef __FreeBSD__
 #include <sys/bus.h>
 #endif
 #include <sys/ioccom.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
 @@ -80,27 +80,27 @@ __KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.2
 #include <dev/usb/usb.h>
 #include <dev/usb/usbcdc.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/usb_quirks.h>
 #include <dev/usb/ucomvar.h>
 #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,
 	   &ubsadebug, 0, "ubsa debug level");
 #endif
 #define	DPRINTFN(n, x)	do { \
 				if (ubsadebug > (n)) \
 					printf x; \
 			} while (0)
 #else
 #define	DPRINTFN(n, x)
 #endif

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -28,27 +28,27 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * USB DMA memory allocation.
  * We need to allocate a lot of small (many 8 byte, some larger)
  * memory blocks that can be used for DMA.  Using the bus_dma
  * routines directly would incur large overheads in space and time.
  */
 #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"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/device.h>		/* for usbdivar.h */
 #include <sys/bus.h>
 #include <sys/cpu.h>
 @@ -120,27 +120,27 @@ usb_block_allocmem(bus_dma_tag_t tag, si
 		    (unsigned long) size);
+	}
 #endif
 	s = splusb();
 	/* First check the free list. */
 	LIST_FOREACH(b, &usb_blk_freelist, next) {
 		if (b->tag == tag && b->size >= size && b->align >= align) {
 			LIST_REMOVE(b, next);
 			usb_blk_nfree--;
 			splx(s);
 			*dmap = b;
 			DPRINTFN(6,("usb_block_allocmem: free list size=%zu\n",
-			    p->size));
+			    b->size));
 			return (USBD_NORMAL_COMPLETION);
+		}
+	}
 	splx(s);
 #ifdef DIAGNOSTIC
 	if (cpu_intr_p()) {
 		printf("usb_block_allocmem: in interrupt context, failed\n");
 		return (USBD_NOMEM);
+	}
 #endif
 	DPRINTFN(6, ("usb_block_allocmem: no free\n"));
 @@ -198,27 +198,27 @@ usb_block_real_freemem(usb_dma_block_t *
 		printf("usb_block_real_freemem: in interrupt context\n");
 		return;
+	}
 #endif
 	bus_dmamap_unload(b->tag, b->map);
 	bus_dmamap_destroy(b->tag, b->map);
 	bus_dmamem_unmap(b->tag, b->kaddr, b->size);
 	bus_dmamem_free(b->tag, b->segs, b->nsegs);
 	free(p, M_USB);
+}
 #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;
 	LIST_FOREACH(xb, qh, next) {
 		if (xb == b)
 			return true;
+	}
 	return false;
+}
 #endif
 /*
  * Do not free the memory unconditionally since we might be called