Module Name: src
Committed By: skrll
Date: Sun Feb 1 06:30:29 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: ohci.c ohcivar.h
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.254.2.15 -r1.254.2.16 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.55.6.4 -r1.55.6.5 src/sys/dev/usb/ohcivar.h
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.15 src/sys/dev/usb/ohci.c:1.254.2.16
--- src/sys/dev/usb/ohci.c:1.254.2.15 Sat Dec 6 08:27:23 2014
+++ src/sys/dev/usb/ohci.c Sun Feb 1 06:30:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.254.2.15 2014/12/06 08:27:23 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.254.2.16 2015/02/01 06:30:29 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.15 2014/12/06 08:27:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.16 2015/02/01 06:30:29 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1710,15 +1710,15 @@ ohci_device_request(usbd_xfer_handle xfe
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
}
- memcpy(KERNADDR(&opipe->u.ctl.reqdma, 0), req, sizeof *req);
- usb_syncmem(&opipe->u.ctl.reqdma, 0, sizeof *req, BUS_DMASYNC_PREWRITE);
+ memcpy(KERNADDR(&opipe->u.ctl.reqdma, 0), req, sizeof(*req));
+ usb_syncmem(&opipe->u.ctl.reqdma, 0, sizeof(*req), BUS_DMASYNC_PREWRITE);
setup->td.td_flags = HTOO32(OHCI_TD_SETUP | OHCI_TD_NOCC |
OHCI_TD_TOGGLE_0 | OHCI_TD_NOINTR);
setup->td.td_cbp = HTOO32(DMAADDR(&opipe->u.ctl.reqdma, 0));
setup->nexttd = next;
setup->td.td_nexttd = HTOO32(next->physaddr);
- setup->td.td_be = HTOO32(O32TOH(setup->td.td_cbp) + sizeof *req - 1);
+ setup->td.td_be = HTOO32(O32TOH(setup->td.td_cbp) + sizeof(*req) - 1);
setup->len = 0;
setup->xfer = xfer;
setup->flags = 0;
Index: src/sys/dev/usb/ohcivar.h
diff -u src/sys/dev/usb/ohcivar.h:1.55.6.4 src/sys/dev/usb/ohcivar.h:1.55.6.5
--- src/sys/dev/usb/ohcivar.h:1.55.6.4 Fri Dec 5 13:23:38 2014
+++ src/sys/dev/usb/ohcivar.h Sun Feb 1 06:30:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ohcivar.h,v 1.55.6.4 2014/12/05 13:23:38 skrll Exp $ */
+/* $NetBSD: ohcivar.h,v 1.55.6.5 2015/02/01 06:30:29 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@ typedef struct ohci_soft_ed {
usb_dma_t dma;
int offs;
} ohci_soft_ed_t;
-#define OHCI_SED_SIZE ((sizeof (struct ohci_soft_ed) + OHCI_ED_ALIGN - 1) / OHCI_ED_ALIGN * OHCI_ED_ALIGN)
+#define OHCI_SED_SIZE ((sizeof(struct ohci_soft_ed) + OHCI_ED_ALIGN - 1) / OHCI_ED_ALIGN * OHCI_ED_ALIGN)
#define OHCI_SED_CHUNK 128
@@ -60,7 +60,7 @@ typedef struct ohci_soft_td {
#define OHCI_CALL_DONE 0x0001
#define OHCI_ADD_LEN 0x0002
} ohci_soft_td_t;
-#define OHCI_STD_SIZE ((sizeof (struct ohci_soft_td) + OHCI_TD_ALIGN - 1) / OHCI_TD_ALIGN * OHCI_TD_ALIGN)
+#define OHCI_STD_SIZE ((sizeof(struct ohci_soft_td) + OHCI_TD_ALIGN - 1) / OHCI_TD_ALIGN * OHCI_TD_ALIGN)
#define OHCI_STD_CHUNK 128
@@ -76,7 +76,7 @@ typedef struct ohci_soft_itd {
uint16_t flags;
char isdone; /* used only when DIAGNOSTIC is defined */
} ohci_soft_itd_t;
-#define OHCI_SITD_SIZE ((sizeof (struct ohci_soft_itd) + OHCI_ITD_ALIGN - 1) / OHCI_ITD_ALIGN * OHCI_ITD_ALIGN)
+#define OHCI_SITD_SIZE ((sizeof(struct ohci_soft_itd) + OHCI_ITD_ALIGN - 1) / OHCI_ITD_ALIGN * OHCI_ITD_ALIGN)
#define OHCI_SITD_CHUNK 64
