 @@ -1,14 +1,14 @@
-/*	$NetBSD: ehci.c,v 1.234.2.35 2015/03/02 21:52:02 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.234.2.36 2015/03/02 22:16:38 skrll Exp $ */
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net), Charles M. Hannum,
  * Jeremy Morse (jeremy.morse@gmail.com), Jared D. McNeill
  * (jmcneill@invisible.ca) and Matthew R. Green (mrg@eterna.com.au).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -43,27 +43,27 @@
 /*
  * TODO:
  * 1) hold off explorations by companion controllers until ehci has started.
+ *
  * 2) The hub driver needs to handle and schedule the transaction translator,
  *    to assign place in frame where different devices get to go. See chapter
  *    on hubs in USB 2.0 for details.
+ *
  * 3) Command failures are not recovered correctly.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.35 2015/03/02 21:52:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.36 2015/03/02 22:16:38 skrll Exp $");
 #include "ohci.h"
 #include "uhci.h"
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 @@ -2757,27 +2757,27 @@ ehci_free_sqtd(ehci_softc_t *sc, ehci_so
+}
 Static usbd_status
 ehci_alloc_sqtd_chain(struct ehci_pipe *epipe, ehci_softc_t *sc,
 		     int alen, int rd, usbd_xfer_handle xfer,
 		     ehci_soft_qtd_t **sp, ehci_soft_qtd_t **ep)
+{
 	ehci_soft_qtd_t *next, *cur;
 	ehci_physaddr_t nextphys;
 	uint32_t qtdstatus;
 	int len, curlen, mps;
 	int i, tog;
 	int pages, pageoffs;
-	bus_size_t curoffs;
+	size_t curoffs;
 	vaddr_t va, va_offs;
 	usb_dma_t *dma = &xfer->ux_dmabuf;
 	uint16_t flags = xfer->ux_flags;
 	paddr_t a;
 	USBHIST_FUNC(); USBHIST_CALLED(ehcidebug);
 	USBHIST_LOG(ehcidebug, "start len=%d", alen, 0, 0, 0);
 	len = alen;
 	qtdstatus = EHCI_QTD_ACTIVE |
 	    EHCI_QTD_SET_PID(rd ? EHCI_QTD_PID_IN : EHCI_QTD_PID_OUT) |
 	    EHCI_QTD_SET_CERR(3)
 @@ -2804,27 +2804,27 @@ ehci_alloc_sqtd_chain(struct ehci_pipe *
 			/* we can handle it in this QTD */
 			curlen = len - curoffs;
 		} else {
 			/* must use multiple TDs, fill as much as possible. */
 			curlen = EHCI_QTD_MAXTRANSFER - va_offs;
 			/* the length must be a multiple of the max size */
 			curlen -= curlen % mps;
 			USBHIST_LOG(ehcidebug, "multiple QTDs, "
 				    "curlen=%d", curlen, 0, 0, 0);
 			KASSERT(curlen != 0);
+		}
 		USBHIST_LOG(ehcidebug, "len=%d curlen=%d curoffs=%zu",
-			len, curlen, (size_t)curoffs, 0);
+			len, curlen, curoffs, 0);
 		/*
 		 * Allocate another transfer if there's more data left,
 		 * or if force last short transfer flag is set and we're
 		 * allocating a multiple of the max packet size.
 		 */
 		if (curoffs + curlen != len ||
 		    ((curlen % mps) == 0 && !rd && curlen != 0 &&
 		     (flags & USBD_FORCE_SHORT_XFER))) {
 			next = ehci_alloc_sqtd(sc);
 			if (next == NULL)
 				goto nomem;
 @@ -2847,27 +2847,27 @@ ehci_alloc_sqtd_chain(struct ehci_pipe *
 		/* First buffer pointer requires a page offset to start at */
 		va = (vaddr_t)KERNADDR(dma, curoffs);
 		cur->qtd.qtd_buffer[0] |= htole32(EHCI_PAGE_OFFSET(va));
 		cur->nextqtd = next;
 		cur->qtd.qtd_next = cur->qtd.qtd_altnext = nextphys;
 		cur->qtd.qtd_status =
 		    htole32(qtdstatus | EHCI_QTD_SET_BYTES(curlen));
 		cur->xfer = xfer;
 		cur->len = curlen;
 		USBHIST_LOG(ehcidebug, "cbp=0x%08zx end=0x%08zx",
-		    (size_t)curoffs, (size_t)(curoffs + curlen), 0, 0);
+		    curoffs, curoffs + curlen, 0, 0);
 		/*
 		 * adjust the toggle based on the number of packets in this
 		 * qtd
 		 */
 		if (((curlen + mps - 1) / mps) & 1) {
 			tog ^= 1;
 			qtdstatus ^= EHCI_QTD_TOGGLE_MASK;
+		}
 		if (next == NULL)
 			break;
 		usb_syncmem(&cur->dma, cur->offs, sizeof(cur->qtd),
 		    BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);