 @@ -1,14 +1,14 @@
-/*	$NetBSD: ahci.c,v 1.22 2020/04/05 20:59:38 skrll Exp $	*/
+/*	$NetBSD: ahci.c,v 1.23 2021/01/05 16:30:37 skrll Exp $	*/
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
  * 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
 @@ -54,27 +54,27 @@
  * 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.
  */
 /*
  * !! HIGHLY EXPERIMENTAL CODE !!
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.22 2020/04/05 20:59:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.23 2021/01/05 16:30:37 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 #include <machine/cpu.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 @@ -879,27 +879,27 @@ ahci_device_ctrl_start(struct usbd_xfer
 		td3 = (struct admhcd_td *)KSEG1ADDR(&td_v[3]);
 		err = usb_allocmem(&sc->sc_bus,
 			sizeof(usb_device_request_t),
 , USBMALLOC_COHERENT, &reqdma);
 		if (err)
 			return USBD_NOMEM;
 		/* printf("ep: %p\n",ep); */
 	};
 	ep->control =  pipe->up_dev->ud_addr | \
 		((pipe->up_dev->ud_speed==USB_SPEED_FULL)?ADMHCD_ED_SPEED:0) | \
 		((UGETW(pipe->up_endpoint->ue_edesc->wMaxPacketSize))<<ADMHCD_ED_MAXSHIFT);
-	memcpy(KERNADDR(&reqdma, 0), req, sizeof *req);
+	memcpy(KERNADDR(&reqdma, 0), req, sizeof(*req));
 /* 	printf("status: %x\n",REG_READ(ADMHCD_REG_PORTSTATUS0));
 	printf("ep_control: %x\n",ep->control);
 	printf("speed: %x\n",pipe->up_dev->ud_speed);
 	printf("req: %p\n",req);
 	printf("dmabuf: %p\n",xfer->ux_dmabuf.block); */
 	isread = req->bmRequestType & UT_READ;
 	len = UGETW(req->wLength);
 	ep->next = ep;
 	td->buffer = DMAADDR(&reqdma,0) | 0xa0000000;
 	td->buflen=sizeof(*req);
 @@ -1226,36 +1226,37 @@ ahci_device_bulk_start(struct usbd_xfer
 /*	printf("level: %d\n",level);
 	printf("short_xfer: %x\n",short_ok);
 	printf("ep_control: %x\n",ep->control);
 	printf("speed: %x\n",pipe->up_dev->ud_speed);
 	printf("dmabuf: %p\n",xfer->ux_dmabuf.block); */
 	isread = UE_GET_DIR(endpt) == UE_DIR_IN;
 	len = xfer->ux_length;
 	ep->next = ep;
 	i = 0;
 	offset = 0;
-	while ((len>0) || (i==0)) {
+	while (len > 0) || i == 0) {
 		tlen = uimin(len,4096);
-		td[i]->buffer = DMAADDR(&xfer->ux_dmabuf,offset) | 0xa0000000;
+		td[i]->buffer = DMAADDR(&xfer->ux_dmabuf, offset) | 0xa0000000;
-		td[i]->buflen=tlen;
+		td[i]->buflen = tlen;
-		td[i]->control=(isread?ADMHCD_TD_IN:ADMHCD_TD_OUT) | toggle | ADMHCD_TD_OWN | short_ok;
+		td[i]->control = (isread ? ADMHCD_TD_IN : ADMHCD_TD_OUT) |
-		td[i]->len=tlen;
+		    toggle | ADMHCD_TD_OWN | short_ok;
 		td[i]->len = tlen;
 		toggle = ADMHCD_TD_TOGGLE;
 		len -= tlen;
 		offset += tlen;
-		td[i]->next = td[i+1];
+		td[i]->next = td[i + 1];
 		i++;
 	};
 	td[i]->buffer = 0;
 	td[i]->buflen = 0;
 	td[i]->control = 0;
 	td[i]->next = 0;
 	ep->head = td[0];
 	ep->tail = td[i];
 	segs = i;
 	len = 0;