Module Name: src
Committed By: skrll
Date: Sun Mar 13 07:11:01 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: ohci.c uaudio.c
Log Message:
KNF (on the right branch this time)
To generate a diff of this commit:
cvs rdiff -u -r1.254.2.57 -r1.254.2.58 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.140.2.12 -r1.140.2.13 src/sys/dev/usb/uaudio.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/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.254.2.57 src/sys/dev/usb/ohci.c:1.254.2.58
--- src/sys/dev/usb/ohci.c:1.254.2.57 Wed Mar 9 08:00:22 2016
+++ src/sys/dev/usb/ohci.c Sun Mar 13 07:11:01 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.254.2.57 2016/03/09 08:00:22 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.254.2.58 2016/03/13 07:11:01 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.57 2016/03/09 08:00:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.58 2016/03/13 07:11:01 skrll Exp $");
#include "opt_usb.h"
@@ -477,7 +477,7 @@ ohci_alloc_std(ohci_softc_t *sc)
return NULL;
mutex_enter(&sc->sc_lock);
- for(i = 0; i < OHCI_STD_CHUNK; i++) {
+ for (i = 0; i < OHCI_STD_CHUNK; i++) {
offs = i * OHCI_STD_SIZE;
std = KERNADDR(&dma, offs);
std->physaddr = DMAADDR(&dma, offs);
@@ -775,7 +775,7 @@ ohci_alloc_sitd(ohci_softc_t *sc)
if (err)
return NULL;
mutex_enter(&sc->sc_lock);
- for(i = 0; i < OHCI_SITD_CHUNK; i++) {
+ for (i = 0; i < OHCI_SITD_CHUNK; i++) {
offs = i * OHCI_SITD_SIZE;
sitd = KERNADDR(&dma, offs);
sitd->physaddr = DMAADDR(&dma, offs);
Index: src/sys/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.140.2.12 src/sys/dev/usb/uaudio.c:1.140.2.13
--- src/sys/dev/usb/uaudio.c:1.140.2.12 Mon Dec 28 09:26:33 2015
+++ src/sys/dev/usb/uaudio.c Sun Mar 13 07:11:01 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.140.2.12 2015/12/28 09:26:33 skrll Exp $ */
+/* $NetBSD: uaudio.c,v 1.140.2.13 2016/03/13 07:11:01 skrll Exp $ */
/*
* Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.140.2.12 2015/12/28 09:26:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.140.2.13 2016/03/13 07:11:01 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2974,7 +2974,7 @@ uaudio_chan_rintr(struct usbd_xfer *xfer
* Transfer data from channel buffer to upper layer buffer, taking
* care of wrapping the upper layer buffer.
*/
- for(i = 0; i < UAUDIO_NFRAMES; i++) {
+ for (i = 0; i < UAUDIO_NFRAMES; i++) {
frsize = cb->sizes[i];
n = min(frsize, ch->end - ch->cur);
memcpy(ch->cur, cb->buffer + cb->offsets[i], n);
