Module Name: src
Committed By: skrll
Date: Sun Nov 30 13:14:11 UTC 2014
Modified Files:
src/sys/arch/mips/adm5120/dev [nick-nhusb]: ahci.c ahcireg.h
src/sys/dev/usb [nick-nhusb]: ehci.c motg.c ohci.c ohcireg.h u3g.c
udsbr.c uftdi.c ugensa.c uhci.c uhid.c uhidev.h uhmodem.c
umass_isdata.c umct.c umidi.c umidi_quirks.h ums.c uplcom.c
usb_mem.h usb_quirks.c usbdi.c usbdi_util.c uscanner.c usscanner.c
src/sys/external/bsd/dwc2 [nick-nhusb]: dwc2.c
src/sys/rump/dev/lib/libugenhc [nick-nhusb]: ugenhc_dma.c
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.12.6.1 -r1.12.6.2 src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.1.108.1 -r1.1.108.2 src/sys/arch/mips/adm5120/dev/ahcireg.h
cvs rdiff -u -r1.234.2.1 -r1.234.2.2 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.12.2.1 -r1.12.2.2 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.254.2.1 -r1.254.2.2 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.24.6.1 -r1.24.6.2 src/sys/dev/usb/ohcireg.h
cvs rdiff -u -r1.31.2.1 -r1.31.2.2 src/sys/dev/usb/u3g.c
cvs rdiff -u -r1.22.14.1 -r1.22.14.2 src/sys/dev/usb/udsbr.c
cvs rdiff -u -r1.59.6.1 -r1.59.6.2 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.31.6.1 -r1.31.6.2 src/sys/dev/usb/ugensa.c
cvs rdiff -u -r1.264.4.1 -r1.264.4.2 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.92.4.1 -r1.92.4.2 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.15.4.1 -r1.15.4.2 src/sys/dev/usb/uhidev.h
cvs rdiff -u -r1.13.24.1 -r1.13.24.2 src/sys/dev/usb/uhmodem.c
cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/sys/dev/usb/umass_isdata.c
cvs rdiff -u -r1.32.24.1 -r1.32.24.2 src/sys/dev/usb/umct.c
cvs rdiff -u -r1.65.14.1 -r1.65.14.2 src/sys/dev/usb/umidi.c
cvs rdiff -u -r1.8.60.1 -r1.8.60.2 src/sys/dev/usb/umidi_quirks.h
cvs rdiff -u -r1.87.6.1 -r1.87.6.2 src/sys/dev/usb/ums.c
cvs rdiff -u -r1.74.4.1 -r1.74.4.2 src/sys/dev/usb/uplcom.c
cvs rdiff -u -r1.30.14.1 -r1.30.14.2 src/sys/dev/usb/usb_mem.h
cvs rdiff -u -r1.81.2.1 -r1.81.2.2 src/sys/dev/usb/usb_quirks.c
cvs rdiff -u -r1.162.2.1 -r1.162.2.2 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/sys/dev/usb/usbdi_util.c
cvs rdiff -u -r1.75.4.1 -r1.75.4.2 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.38.6.1 -r1.38.6.2 src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/external/bsd/dwc2/dwc2.c
cvs rdiff -u -r1.1 -r1.1.12.1 src/sys/rump/dev/lib/libugenhc/ugenhc_dma.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/arch/mips/adm5120/dev/ahci.c
diff -u src/sys/arch/mips/adm5120/dev/ahci.c:1.12.6.1 src/sys/arch/mips/adm5120/dev/ahci.c:1.12.6.2
--- src/sys/arch/mips/adm5120/dev/ahci.c:1.12.6.1 Sun Nov 30 12:18:58 2014
+++ src/sys/arch/mips/adm5120/dev/ahci.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ahci.c,v 1.12.6.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ahci.c,v 1.12.6.2 2014/11/30 13:14:11 skrll Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.12.6.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.12.6.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -307,15 +307,15 @@ ahci_attach(device_t parent, device_t se
REG_WRITE(ADMHCD_REG_INTENABLE, 0); /* disable interrupts */
REG_WRITE(ADMHCD_REG_CONTROL, ADMHCD_SW_RESET); /* reset */
delay_ms(10);
- while (REG_READ(ADMHCD_REG_CONTROL) & ADMHCD_SW_RESET)
- delay_ms(1);
+ while (REG_READ(ADMHCD_REG_CONTROL) & ADMHCD_SW_RESET)
+ delay_ms(1);
REG_WRITE(ADMHCD_REG_CONTROL, ADMHCD_HOST_EN);
- REG_WRITE(ADMHCD_REG_HOSTHEAD, 0x00000000);
- REG_WRITE(ADMHCD_REG_FMINTERVAL, 0x20002edf);
- REG_WRITE(ADMHCD_REG_LSTHRESH, 0x628);
- REG_WRITE(ADMHCD_REG_RHDESCR, ADMHCD_NPS | ADMHCD_LPSC);
- REG_WRITE(ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP);
+ REG_WRITE(ADMHCD_REG_HOSTHEAD, 0x00000000);
+ REG_WRITE(ADMHCD_REG_FMINTERVAL, 0x20002edf);
+ REG_WRITE(ADMHCD_REG_LSTHRESH, 0x628);
+ REG_WRITE(ADMHCD_REG_RHDESCR, ADMHCD_NPS | ADMHCD_LPSC);
+ REG_WRITE(ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP);
REG_WRITE(ADMHCD_REG_INTENABLE, 0); /* XXX: enable interrupts */
@@ -1066,7 +1066,7 @@ ahci_device_ctrl_start(usbd_xfer_handle
static struct admhcd_td td_v[4] __attribute__((aligned(16))), *td, *td1, *td2, *td3;
static usb_dma_t reqdma;
usbd_pipe_handle pipe = xfer->pipe;
- usb_device_request_t *req = &xfer->request;
+ usb_device_request_t *req = &xfer->request;
struct ahci_softc *sc = (struct ahci_softc *)pipe->device->bus;
int len, isread;
@@ -1078,17 +1078,17 @@ ahci_device_ctrl_start(usbd_xfer_handle
/* printf("ctrl_start>>>\n"); */
#ifdef DIAGNOSTIC
- if (!(xfer->rqflags & URQ_REQUEST)) {
- /* XXX panic */
- printf("ahci_device_ctrl_transfer: not a request\n");
- return (USBD_INVAL);
- }
+ if (!(xfer->rqflags & URQ_REQUEST)) {
+ /* XXX panic */
+ printf("ahci_device_ctrl_transfer: not a request\n");
+ return (USBD_INVAL);
+ }
#endif
#define KSEG1ADDR(x) (0xa0000000 | (((uint32_t)x) & 0x1fffffff))
DPRINTF(D_TRACE, ("st "));
if (!ep) {
- ep = (struct admhcd_ed *)KSEG1ADDR(&ep_v);
+ ep = (struct admhcd_ed *)KSEG1ADDR(&ep_v);
td = (struct admhcd_td *)KSEG1ADDR(&td_v[0]);
td1 = (struct admhcd_td *)KSEG1ADDR(&td_v[1]);
td2 = (struct admhcd_td *)KSEG1ADDR(&td_v[2]);
@@ -1115,11 +1115,11 @@ ahci_device_ctrl_start(usbd_xfer_handle
isread = req->bmRequestType & UT_READ;
len = UGETW(req->wLength);
- ep->next = ep;
+ ep->next = ep;
- td->buffer = DMAADDR(&reqdma,0) | 0xa0000000;
- td->buflen=sizeof(*req);
- td->control=ADMHCD_TD_SETUP | ADMHCD_TD_DATA0 | ADMHCD_TD_OWN;
+ td->buffer = DMAADDR(&reqdma,0) | 0xa0000000;
+ td->buflen=sizeof(*req);
+ td->control=ADMHCD_TD_SETUP | ADMHCD_TD_DATA0 | ADMHCD_TD_OWN;
if (len) {
td->next = td1;
@@ -1128,10 +1128,10 @@ ahci_device_ctrl_start(usbd_xfer_handle
td1->buflen = len;
td1->next = td2;
td1->control= (isread?ADMHCD_TD_IN:ADMHCD_TD_OUT) | ADMHCD_TD_DATA1 | ADMHCD_TD_R | ADMHCD_TD_OWN;
- } else {
- td1->control = 0;
- td->next = td2;
- };
+ } else {
+ td1->control = 0;
+ td->next = td2;
+ };
td2->buffer = 0;
td2->buflen= 0;
@@ -1162,41 +1162,41 @@ ahci_device_ctrl_start(usbd_xfer_handle
printf("td3->next: %p\n",td3->next);
*/
- REG_WRITE(ADMHCD_REG_HOSTHEAD, (uint32_t)ep);
- REG_WRITE(ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP | ADMHCD_DMA_EN);
+ REG_WRITE(ADMHCD_REG_HOSTHEAD, (uint32_t)ep);
+ REG_WRITE(ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP | ADMHCD_DMA_EN);
/* printf("1: %x %x %x %x\n", ep->control, td->control, td1->control, td2->control); */
- s=100;
- while (s--) {
- delay_ms(10);
+ s=100;
+ while (s--) {
+ delay_ms(10);
/* printf("%x %x %x %x\n", ep->control, td->control, td1->control, td2->control);*/
status = USBD_TIMEOUT;
- if (td->control & ADMHCD_TD_OWN) continue;
+ if (td->control & ADMHCD_TD_OWN) continue;
- err = (td->control & ADMHCD_TD_ERRMASK)>>ADMHCD_TD_ERRSHIFT;
- if (err) {
+ err = (td->control & ADMHCD_TD_ERRMASK)>>ADMHCD_TD_ERRSHIFT;
+ if (err) {
status = USBD_IOERROR;
- break;
- };
+ break;
+ };
status = USBD_TIMEOUT;
- if (td1->control & ADMHCD_TD_OWN) continue;
- err = (td1->control & ADMHCD_TD_ERRMASK)>>ADMHCD_TD_ERRSHIFT;
- if (err) {
+ if (td1->control & ADMHCD_TD_OWN) continue;
+ err = (td1->control & ADMHCD_TD_ERRMASK)>>ADMHCD_TD_ERRSHIFT;
+ if (err) {
status = USBD_IOERROR;
- break;
- };
+ break;
+ };
status = USBD_TIMEOUT;
- if (td2->control & ADMHCD_TD_OWN) continue;
- err = (td2->control & ADMHCD_TD_ERRMASK)>>ADMHCD_TD_ERRSHIFT;
- if (err) {
+ if (td2->control & ADMHCD_TD_OWN) continue;
+ err = (td2->control & ADMHCD_TD_ERRMASK)>>ADMHCD_TD_ERRSHIFT;
+ if (err) {
status = USBD_IOERROR;
- };
+ };
status = USBD_NORMAL_COMPLETION;
- break;
+ break;
};
- REG_WRITE(ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP);
+ REG_WRITE(ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP);
xfer->actlen = len;
xfer->status = status;
@@ -1418,7 +1418,7 @@ ahci_device_bulk_start(usbd_xfer_handle
/* printf("bulk_start>>>\n"); */
if (!ep) {
- ep = (struct admhcd_ed *)KSEG1ADDR(&ep_v);
+ ep = (struct admhcd_ed *)KSEG1ADDR(&ep_v);
for (i=0; i<NBULK_TDS; i++) {
td[i] = (struct admhcd_td *)KSEG1ADDR(&td_v[i]);
};
@@ -1442,10 +1442,10 @@ ahci_device_bulk_start(usbd_xfer_handle
printf("speed: %x\n",pipe->device->speed);
printf("dmabuf: %p\n",xfer->dmabuf.block); */
- isread = UE_GET_DIR(endpt) == UE_DIR_IN;
- len = xfer->length;
+ isread = UE_GET_DIR(endpt) == UE_DIR_IN;
+ len = xfer->length;
- ep->next = ep;
+ ep->next = ep;
i = 0;
offset = 0;
@@ -1486,27 +1486,27 @@ ahci_device_bulk_start(usbd_xfer_handle
printf("td[%d]->buflen: %x\n",i,td[i]->buflen);
}; */
- REG_WRITE(ADMHCD_REG_HOSTHEAD, (uint32_t)ep);
- REG_WRITE(ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP | ADMHCD_DMA_EN);
+ REG_WRITE(ADMHCD_REG_HOSTHEAD, (uint32_t)ep);
+ REG_WRITE(ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP | ADMHCD_DMA_EN);
i = 0;
/* printf("1: %x %d %x %x\n", ep->control, i, td[i]->control, td[i]->buflen); */
- s=100;
+ s=100;
err = 0;
- while (s--) {
+ while (s--) {
/* printf("%x %d %x %x\n", ep->control, i, td[i]->control, td[i]->buflen); */
status = USBD_TIMEOUT;
- if (td[i]->control & ADMHCD_TD_OWN) {
+ if (td[i]->control & ADMHCD_TD_OWN) {
delay_ms(3);
continue;
};
len += td[i]->len - td[i]->buflen;
- err = (td[i]->control & ADMHCD_TD_ERRMASK)>>ADMHCD_TD_ERRSHIFT;
- if (err) {
+ err = (td[i]->control & ADMHCD_TD_ERRMASK)>>ADMHCD_TD_ERRSHIFT;
+ if (err) {
status = USBD_IOERROR;
- break;
- };
+ break;
+ };
i++;
if (i==segs) {
@@ -1515,7 +1515,7 @@ ahci_device_bulk_start(usbd_xfer_handle
};
};
- REG_WRITE(ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP);
+ REG_WRITE(ADMHCD_REG_HOSTCONTROL, ADMHCD_STATE_OP);
apipe->toggle = ((uint32_t)ep->head & 2)?ADMHCD_TD_DATA1:ADMHCD_TD_DATA0;
/* printf("bulk_transfer_done: status: %x, err: %x, len: %x, toggle: %x\n", status,err,len,apipe->toggle); */
@@ -1680,7 +1680,7 @@ ahci_abort_xfer(usbd_xfer_handle xfer, u
void
ahci_device_clear_toggle(usbd_pipe_handle pipe)
{
- struct ahci_pipe *apipe = (struct ahci_pipe *)pipe;
+ struct ahci_pipe *apipe = (struct ahci_pipe *)pipe;
apipe->toggle = 0;
}
Index: src/sys/arch/mips/adm5120/dev/ahcireg.h
diff -u src/sys/arch/mips/adm5120/dev/ahcireg.h:1.1.108.1 src/sys/arch/mips/adm5120/dev/ahcireg.h:1.1.108.2
--- src/sys/arch/mips/adm5120/dev/ahcireg.h:1.1.108.1 Sun Nov 30 12:18:58 2014
+++ src/sys/arch/mips/adm5120/dev/ahcireg.h Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcireg.h,v 1.1.108.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ahcireg.h,v 1.1.108.2 2014/11/30 13:14:11 skrll Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -78,13 +78,13 @@
#define ADMHCD_PRSC 0x00100000 /* reset status change */
struct admhcd_ed {
- /* Don't change first four, they used for DMA */
- volatile uint32_t control;
- volatile struct admhcd_td *tail;
- volatile struct admhcd_td *head;
- volatile struct admhcd_ed *next;
- /* the rest is for the driver only: */
- uint32_t unused[4];
+ /* Don't change first four, they used for DMA */
+ volatile uint32_t control;
+ volatile struct admhcd_td *tail;
+ volatile struct admhcd_td *head;
+ volatile struct admhcd_ed *next;
+ /* the rest is for the driver only: */
+ uint32_t unused[4];
} __attribute__ ((packed));
#define ADMHCD_ED_EPSHIFT 7 /* Shift for endpoint number */
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.1 src/sys/dev/usb/ehci.c:1.234.2.2
--- src/sys/dev/usb/ehci.c:1.234.2.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/ehci.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.234.2.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.234.2.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.2 2014/11/30 13:14:11 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -2097,7 +2097,7 @@ ehci_rem_free_itd_chain(ehci_softc_t *sc
sc->sc_flist[itd->slot] = itd->itd.itd_next;
usb_syncmem(&sc->sc_fldma,
sizeof(ehci_link_t) * itd->slot,
- sizeof(ehci_link_t),
+ sizeof(ehci_link_t),
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
if (itd->u.frame_list.next != NULL)
@@ -2107,7 +2107,7 @@ ehci_rem_free_itd_chain(ehci_softc_t *sc
prev->itd.itd_next = itd->itd.itd_next;
usb_syncmem(&itd->dma,
itd->offs + offsetof(ehci_itd_t, itd_next),
- sizeof(itd->itd.itd_next), BUS_DMASYNC_PREWRITE);
+ sizeof(itd->itd.itd_next), BUS_DMASYNC_PREWRITE);
prev->u.frame_list.next = itd->u.frame_list.next;
if (itd->u.frame_list.next != NULL)
@@ -3088,8 +3088,8 @@ ehci_alloc_itd(ehci_softc_t *sc)
LIST_REMOVE(itd, u.free_list);
memset(&itd->itd, 0, sizeof(ehci_itd_t));
usb_syncmem(&itd->dma, itd->offs + offsetof(ehci_itd_t, itd_next),
- sizeof(itd->itd.itd_next), BUS_DMASYNC_PREWRITE |
- BUS_DMASYNC_PREREAD);
+ sizeof(itd->itd.itd_next),
+ BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
itd->u.frame_list.next = NULL;
itd->u.frame_list.prev = NULL;
@@ -3352,8 +3352,8 @@ ehci_abort_isoc_xfer(usbd_xfer_handle xf
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
}
- sc->sc_softwake = 1;
- usb_schedsoftintr(&sc->sc_bus);
+ sc->sc_softwake = 1;
+ usb_schedsoftintr(&sc->sc_bus);
cv_wait(&sc->sc_softwake_cv, &sc->sc_lock);
#ifdef DIAGNOSTIC
@@ -4211,7 +4211,7 @@ ehci_device_isoc_start(usbd_xfer_handle
htole32(itd->physaddr | EHCI_LINK_ITD);
usb_syncmem(&itd->dma,
itd->offs + offsetof(ehci_itd_t, itd_next),
- sizeof(itd->itd.itd_next), BUS_DMASYNC_POSTWRITE);
+ sizeof(itd->itd.itd_next), BUS_DMASYNC_POSTWRITE);
prev->xfer_next = itd;
} else {
@@ -4292,7 +4292,7 @@ ehci_device_isoc_start(usbd_xfer_handle
usb_syncmem(&itd->dma,
itd->offs + offsetof(ehci_itd_t, itd_next),
- sizeof(ehci_itd_t),
+ sizeof(ehci_itd_t),
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
prev = itd;
@@ -4346,14 +4346,14 @@ ehci_device_isoc_start(usbd_xfer_handle
usb_syncmem(&itd->dma,
itd->offs + offsetof(ehci_itd_t, itd_next),
- sizeof(itd->itd.itd_next),
+ sizeof(itd->itd.itd_next),
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
sc->sc_flist[frindex] = htole32(EHCI_LINK_ITD | itd->physaddr);
usb_syncmem(&sc->sc_fldma,
sizeof(ehci_link_t) * frindex,
- sizeof(ehci_link_t),
+ sizeof(ehci_link_t),
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
itd->u.frame_list.next = sc->sc_softitds[frindex];
@@ -4428,6 +4428,6 @@ ehci_device_isoc_done(usbd_xfer_handle x
}
usb_syncmem(&xfer->dmabuf, 0, xfer->length, BUS_DMASYNC_POSTWRITE |
- BUS_DMASYNC_POSTREAD);
+ BUS_DMASYNC_POSTREAD);
}
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.12.2.1 src/sys/dev/usb/motg.c:1.12.2.2
--- src/sys/dev/usb/motg.c:1.12.2.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/motg.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.12.2.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: motg.c,v 1.12.2.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include "opt_motg.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.12.2.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,15 +191,15 @@ UREAD4(struct motg_softc *sc, bus_size_t
static void
musbotg_pull_common(struct motg_softc *sc, uint8_t on)
{
- uint8_t val;
+ uint8_t val;
- val = UREAD1(sc, MUSB2_REG_POWER);
- if (on)
- val |= MUSB2_MASK_SOFTC;
- else
- val &= ~MUSB2_MASK_SOFTC;
+ val = UREAD1(sc, MUSB2_REG_POWER);
+ if (on)
+ val |= MUSB2_MASK_SOFTC;
+ else
+ val &= ~MUSB2_MASK_SOFTC;
- UWRITE1(sc, MUSB2_REG_POWER, val);
+ UWRITE1(sc, MUSB2_REG_POWER, val);
}
const struct usbd_bus_methods motg_bus_methods = {
@@ -1620,7 +1620,7 @@ motg_device_ctrl_intr_rx(struct motg_sof
ep->phase != STATUS_IN)
panic("motg_device_ctrl_intr_rx: bad phase %d", ep->phase);
#endif
- /* select endpoint 0 */
+ /* select endpoint 0 */
UWRITE1(sc, MUSB2_REG_EPINDEX, 0);
/* read out FIFO status */
@@ -1745,7 +1745,7 @@ motg_device_ctrl_intr_tx(struct motg_sof
ep->phase != STATUS_OUT)
panic("motg_device_ctrl_intr_tx: bad phase %d", ep->phase);
#endif
- /* select endpoint 0 */
+ /* select endpoint 0 */
UWRITE1(sc, MUSB2_REG_EPINDEX, 0);
csr = UREAD1(sc, MUSB2_REG_TXCSRL);
@@ -2135,7 +2135,7 @@ motg_device_intr_rx(struct motg_softc *s
DPRINTFN(MD_BULK,
("motg_device_intr_rx on ep %d\n", epnumber));
- /* select endpoint */
+ /* select endpoint */
UWRITE1(sc, MUSB2_REG_EPINDEX, epnumber);
/* read out FIFO status */
@@ -2258,7 +2258,7 @@ motg_device_intr_tx(struct motg_softc *s
DPRINTFN(MD_BULK,
("motg_device_intr_tx on ep %d\n", epnumber));
- /* select endpoint */
+ /* select endpoint */
UWRITE1(sc, MUSB2_REG_EPINDEX, epnumber);
csr = UREAD1(sc, MUSB2_REG_TXCSRL);
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.254.2.1 src/sys/dev/usb/ohci.c:1.254.2.2
--- src/sys/dev/usb/ohci.c:1.254.2.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/ohci.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.254.2.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.254.2.2 2014/11/30 13:14:11 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.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1728,11 +1728,11 @@ ohci_device_request(usbd_xfer_handle xfe
sed = opipe->sed;
opipe->u.ctl.length = len;
- KASSERTMSG(OHCI_ED_GET_FA(O32TOH(sed->ed.ed_flags)) == dev->address,
+ KASSERTMSG(OHCI_ED_GET_FA(O32TOH(sed->ed.ed_flags)) == dev->address,
"address ED %d pipe %d\n",
OHCI_ED_GET_FA(O32TOH(sed->ed.ed_flags)), dev->address);
- KASSERTMSG(OHCI_ED_GET_MAXP(O32TOH(sed->ed.ed_flags)) ==
- UGETW(opipe->pipe.endpoint->edesc->wMaxPacketSize),
+ KASSERTMSG(OHCI_ED_GET_MAXP(O32TOH(sed->ed.ed_flags)) ==
+ UGETW(opipe->pipe.endpoint->edesc->wMaxPacketSize),
"MPL ED %d pipe %d\n",
OHCI_ED_GET_MAXP(O32TOH(sed->ed.ed_flags)),
UGETW(opipe->pipe.endpoint->edesc->wMaxPacketSize));
Index: src/sys/dev/usb/ohcireg.h
diff -u src/sys/dev/usb/ohcireg.h:1.24.6.1 src/sys/dev/usb/ohcireg.h:1.24.6.2
--- src/sys/dev/usb/ohcireg.h:1.24.6.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/ohcireg.h Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ohcireg.h,v 1.24.6.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ohcireg.h,v 1.24.6.2 2014/11/30 13:14:11 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.8 1999/11/17 22:33:40 n_hibma Exp $ */
@@ -120,7 +120,7 @@
#define OHCI_LES (OHCI_PLE | OHCI_IE | OHCI_CLE | OHCI_BLE)
#define OHCI_ALL_INTRS (OHCI_SO | OHCI_WDH | OHCI_SF | OHCI_RD | OHCI_UE | \
- OHCI_FNO | OHCI_RHSC | OHCI_OC)
+ OHCI_FNO | OHCI_RHSC | OHCI_OC)
#define OHCI_NORMAL_INTRS (OHCI_SO | OHCI_WDH | OHCI_RD | OHCI_UE | OHCI_RHSC)
#define OHCI_FSMPS(i) (((i-210)*6/7) << 16)
Index: src/sys/dev/usb/u3g.c
diff -u src/sys/dev/usb/u3g.c:1.31.2.1 src/sys/dev/usb/u3g.c:1.31.2.2
--- src/sys/dev/usb/u3g.c:1.31.2.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/u3g.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.31.2.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: u3g.c,v 1.31.2.2 2014/11/30 13:14:11 skrll Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.31.2.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.31.2.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -183,7 +183,7 @@ struct ucom_methods u3g_methods = {
* Allegedly supported devices
*/
static const struct usb_devno u3g_devs[] = {
- { USB_VENDOR_DELL, USB_PRODUCT_DELL_W5500 },
+ { USB_VENDOR_DELL, USB_PRODUCT_DELL_W5500 },
/* OEM: Huawei */
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E1750 },
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E1820 },
Index: src/sys/dev/usb/udsbr.c
diff -u src/sys/dev/usb/udsbr.c:1.22.14.1 src/sys/dev/usb/udsbr.c:1.22.14.2
--- src/sys/dev/usb/udsbr.c:1.22.14.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/udsbr.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: udsbr.c,v 1.22.14.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: udsbr.c,v 1.22.14.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.22.14.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.22.14.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -231,14 +231,14 @@ void
udsbr_setfreq(struct udsbr_softc *sc, int freq)
{
DPRINTF(("udsbr_setfreq: setfreq=%d\n", freq));
- /*
- * Freq now is in Hz. We need to convert it to the frequency
- * that the radio wants. This frequency is 10.7MHz above
- * the actual frequency. We then need to convert to
- * units of 12.5kHz. We add one to the IFM to make rounding
- * easier.
- */
- freq = (freq * 1000 + 10700001) / 12500;
+ /*
+ * Freq now is in Hz. We need to convert it to the frequency
+ * that the radio wants. This frequency is 10.7MHz above
+ * the actual frequency. We then need to convert to
+ * units of 12.5kHz. We add one to the IFM to make rounding
+ * easier.
+ */
+ freq = (freq * 1000 + 10700001) / 12500;
(void)udsbr_req(sc, 0x01, (freq >> 8) & 0xff, freq & 0xff);
(void)udsbr_req(sc, 0x00, 0x0096, 0x00b7);
usbd_delay_ms(sc->sc_udev, 240); /* wait for signal to settle */
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.59.6.1 src/sys/dev/usb/uftdi.c:1.59.6.2
--- src/sys/dev/usb/uftdi.c:1.59.6.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/uftdi.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.59.6.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: uftdi.c,v 1.59.6.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.59.6.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.59.6.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -188,8 +188,8 @@ uftdi_match(device_t parent, cfdata_t ma
DPRINTFN(20,("uftdi: vendor=0x%x, product=0x%x\n",
uaa->vendor, uaa->product));
- return (uftdi_lookup(uaa->vendor, uaa->product) != NULL ?
- UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
+ return (uftdi_lookup(uaa->vendor, uaa->product) != NULL ?
+ UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
}
void
Index: src/sys/dev/usb/ugensa.c
diff -u src/sys/dev/usb/ugensa.c:1.31.6.1 src/sys/dev/usb/ugensa.c:1.31.6.2
--- src/sys/dev/usb/ugensa.c:1.31.6.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/ugensa.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ugensa.c,v 1.31.6.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ugensa.c,v 1.31.6.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.31.6.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.31.6.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,8 +104,8 @@ static const struct ugensa_type ugensa_d
* to work in similar device drivers on other OSes:
*/
- {{ USB_VENDOR_ANYDATA, USB_PRODUCT_ANYDATA_ADU_500A }, UNTESTED },
- {{ USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_EXPRESSCARD }, UNTESTED },
+ {{ USB_VENDOR_ANYDATA, USB_PRODUCT_ANYDATA_ADU_500A }, UNTESTED },
+ {{ USB_VENDOR_NOVATEL2, USB_PRODUCT_NOVATEL2_EXPRESSCARD }, UNTESTED },
{{ USB_VENDOR_QUALCOMM, USB_PRODUCT_QUALCOMM_MSM_HSDPA }, UNTESTED },
{{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_AIRCARD875 }, UNTESTED },
{{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_EM5625 }, UNTESTED },
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.264.4.1 src/sys/dev/usb/uhci.c:1.264.4.2
--- src/sys/dev/usb/uhci.c:1.264.4.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/uhci.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.264.4.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: uhci.c,v 1.264.4.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -932,33 +932,33 @@ uhci_dump_ii(uhci_intr_info_t *ii)
#else
#define DONE 0
#endif
- if (ii == NULL) {
- printf("ii NULL\n");
- return;
- }
- if (ii->xfer == NULL) {
+ if (ii == NULL) {
+ printf("ii NULL\n");
+ return;
+ }
+ if (ii->xfer == NULL) {
printf("ii %p: done=%d xfer=NULL\n",
ii, DONE);
- return;
- }
- pipe = ii->xfer->pipe;
- if (pipe == NULL) {
+ return;
+ }
+ pipe = ii->xfer->pipe;
+ if (pipe == NULL) {
printf("ii %p: done=%d xfer=%p pipe=NULL\n",
- ii, DONE, ii->xfer);
- return;
+ ii, DONE, ii->xfer);
+ return;
}
- if (pipe->endpoint == NULL) {
+ if (pipe->endpoint == NULL) {
printf("ii %p: done=%d xfer=%p pipe=%p pipe->endpoint=NULL\n",
ii, DONE, ii->xfer, pipe);
- return;
+ return;
}
- if (pipe->device == NULL) {
+ if (pipe->device == NULL) {
printf("ii %p: done=%d xfer=%p pipe=%p pipe->device=NULL\n",
ii, DONE, ii->xfer, pipe);
- return;
+ return;
}
- ed = pipe->endpoint->edesc;
- dev = pipe->device;
+ ed = pipe->endpoint->edesc;
+ dev = pipe->device;
printf("ii %p: done=%d xfer=%p dev=%p vid=0x%04x pid=0x%04x addr=%d pipe=%p ep=0x%02x attr=0x%02x\n",
ii, DONE, ii->xfer, dev,
UGETW(dev->ddesc.idVendor),
@@ -2556,7 +2556,7 @@ uhci_device_request(usbd_xfer_handle xfe
UHCI_TD_ACTIVE | UHCI_TD_IOC);
stat->td.td_token =
htole32(isread ? UHCI_TD_OUT(0, endpt, addr, 1) :
- UHCI_TD_IN (0, endpt, addr, 1));
+ UHCI_TD_IN (0, endpt, addr, 1));
stat->td.td_buffer = htole32(0);
usb_syncmem(&stat->dma, stat->offs, sizeof(stat->td),
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
@@ -2607,7 +2607,7 @@ uhci_device_request(usbd_xfer_handle xfe
for (xqh = sxqh;
xqh != NULL;
xqh = (maxqh++ == 5 || xqh->hlink == sxqh ||
- xqh->hlink == xqh ? NULL : xqh->hlink)) {
+ xqh->hlink == xqh ? NULL : xqh->hlink)) {
uhci_dump_qh(xqh);
}
DPRINTF(("Enqueued QH:\n"));
@@ -2999,8 +2999,8 @@ uhci_device_isoc_done(usbd_xfer_handle x
return;
#ifdef DIAGNOSTIC
- if (ii->stdend == NULL) {
- printf("uhci_device_isoc_done: xfer=%p stdend==NULL\n", xfer);
+ if (ii->stdend == NULL) {
+ printf("uhci_device_isoc_done: xfer=%p stdend==NULL\n", xfer);
#ifdef UHCI_DEBUG
uhci_dump_ii(ii);
#endif
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.92.4.1 src/sys/dev/usb/uhid.c:1.92.4.2
--- src/sys/dev/usb/uhid.c:1.92.4.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/uhid.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.92.4.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: uhid.c,v 1.92.4.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.92.4.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.92.4.2 2014/11/30 13:14:11 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -631,7 +631,7 @@ uhid_do_ioctl(struct uhid_softc *sc, u_l
case USB_GET_DEVICEINFO:
usbd_fill_deviceinfo(sc->sc_hdev.sc_parent->sc_udev,
- (struct usb_device_info *)addr, 0);
+ (struct usb_device_info *)addr, 0);
break;
#ifdef COMPAT_30
case USB_GET_DEVICEINFO_OLD:
@@ -640,15 +640,15 @@ uhid_do_ioctl(struct uhid_softc *sc, u_l
break;
#endif
- case USB_GET_STRING_DESC:
+ case USB_GET_STRING_DESC:
{
- struct usb_string_desc *si = (struct usb_string_desc *)addr;
- err = usbd_get_string_desc(sc->sc_hdev.sc_parent->sc_udev,
+ struct usb_string_desc *si = (struct usb_string_desc *)addr;
+ err = usbd_get_string_desc(sc->sc_hdev.sc_parent->sc_udev,
si->usd_string_index,
- si->usd_language_id, &si->usd_desc, &size);
- if (err)
- return (EINVAL);
- break;
+ si->usd_language_id, &si->usd_desc, &size);
+ if (err)
+ return (EINVAL);
+ break;
}
default:
Index: src/sys/dev/usb/uhidev.h
diff -u src/sys/dev/usb/uhidev.h:1.15.4.1 src/sys/dev/usb/uhidev.h:1.15.4.2
--- src/sys/dev/usb/uhidev.h:1.15.4.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/uhidev.h Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.h,v 1.15.4.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: uhidev.h,v 1.15.4.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@ struct uhidev {
int sc_in_rep_size;
#define UHIDEV_OPEN 0x01 /* device is open */
void (*sc_intr)(struct uhidev *, void *, u_int);
- krndsource_t rnd_source;
+ krndsource_t rnd_source;
};
struct uhidev_attach_arg {
Index: src/sys/dev/usb/uhmodem.c
diff -u src/sys/dev/usb/uhmodem.c:1.13.24.1 src/sys/dev/usb/uhmodem.c:1.13.24.2
--- src/sys/dev/usb/uhmodem.c:1.13.24.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/uhmodem.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uhmodem.c,v 1.13.24.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: uhmodem.c,v 1.13.24.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2008 Yojiro UO <[email protected]>.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.13.24.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.13.24.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -211,7 +211,7 @@ uhmodem_attach(device_t parent, device_t
usbd_devinfo_free(devinfop);
sc->sc_ubsa.sc_dev = self;
- sc->sc_ubsa.sc_udev = dev;
+ sc->sc_ubsa.sc_udev = dev;
sc->sc_ubsa.sc_config_index = UBSA_DEFAULT_CONFIG_INDEX;
sc->sc_ubsa.sc_numif = 1; /* defaut device has one interface */
Index: src/sys/dev/usb/umass_isdata.c
diff -u src/sys/dev/usb/umass_isdata.c:1.30.2.1 src/sys/dev/usb/umass_isdata.c:1.30.2.2
--- src/sys/dev/usb/umass_isdata.c:1.30.2.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/umass_isdata.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_isdata.c,v 1.30.2.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: umass_isdata.c,v 1.30.2.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* TODO:
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.30.2.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.30.2.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,16 +63,16 @@ int umass_wd_attach(struct umass_softc *
/* XXX move this */
struct isd200_config {
- uByte EventNotification;
- uByte ExternalClock;
- uByte ATAInitTimeout;
- uByte ATAMisc1;
+ uByte EventNotification;
+ uByte ExternalClock;
+ uByte ATAInitTimeout;
+ uByte ATAMisc1;
#define ATATiming 0x0f
#define ATAPIReset 0x10
#define MasterSlaveSelection 0x20
#define ATAPICommandBlockSize 0xc0
- uByte ATAMajorCommand;
- uByte ATAMinorCommand;
+ uByte ATAMajorCommand;
+ uByte ATAMinorCommand;
uByte ATAMisc2;
#define LastLUNIdentifier 0x07
#define DescriptOverride 0x08
Index: src/sys/dev/usb/umct.c
diff -u src/sys/dev/usb/umct.c:1.32.24.1 src/sys/dev/usb/umct.c:1.32.24.2
--- src/sys/dev/usb/umct.c:1.32.24.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/umct.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umct.c,v 1.32.24.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: umct.c,v 1.32.24.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.32.24.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.32.24.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -189,7 +189,7 @@ umct_attach(device_t parent, device_t se
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
- sc->sc_udev = dev;
+ sc->sc_udev = dev;
sc->sc_product = uaa->product;
DPRINTF(("\n\numct attach: sc=%p\n", sc));
@@ -325,12 +325,12 @@ umct_detach(device_t self, int flags)
DPRINTF(("umct_detach: sc=%p flags=%d\n", sc, flags));
- if (sc->sc_intr_pipe != NULL) {
- usbd_abort_pipe(sc->sc_intr_pipe);
- usbd_close_pipe(sc->sc_intr_pipe);
+ if (sc->sc_intr_pipe != NULL) {
+ usbd_abort_pipe(sc->sc_intr_pipe);
+ usbd_close_pipe(sc->sc_intr_pipe);
free(sc->sc_intr_buf, M_USBDEV);
- sc->sc_intr_pipe = NULL;
- }
+ sc->sc_intr_pipe = NULL;
+ }
sc->sc_dying = 1;
if (sc->sc_subdev != NULL)
@@ -450,7 +450,7 @@ umct_set_lcr(struct umct_softc *sc, u_in
void
umct_set_baudrate(struct umct_softc *sc, u_int rate)
{
- usb_device_request_t req;
+ usb_device_request_t req;
uDWord arate;
u_int val;
@@ -474,13 +474,13 @@ umct_set_baudrate(struct umct_softc *sc,
}
USETDW(arate, val);
- req.bmRequestType = UMCT_SET_REQUEST;
- req.bRequest = REQ_SET_BAUD_RATE;
- USETW(req.wValue, 0);
- USETW(req.wIndex, sc->sc_iface_number);
- USETW(req.wLength, LENGTH_BAUD_RATE);
+ req.bmRequestType = UMCT_SET_REQUEST;
+ req.bRequest = REQ_SET_BAUD_RATE;
+ USETW(req.wValue, 0);
+ USETW(req.wIndex, sc->sc_iface_number);
+ USETW(req.wLength, LENGTH_BAUD_RATE);
- (void)usbd_do_request(sc->sc_udev, &req, arate); /* XXX should check */
+ (void)usbd_do_request(sc->sc_udev, &req, arate); /* XXX should check */
}
void
@@ -546,9 +546,9 @@ umct_open(void *addr, int portno)
DPRINTF(("umct_open: sc=%p\n", sc));
/* initialize LCR */
- lcr_data = LCR_DATA_BITS_8 | LCR_PARITY_NONE |
+ lcr_data = LCR_DATA_BITS_8 | LCR_PARITY_NONE |
LCR_STOP_BITS_1;
- umct_set_lcr(sc, lcr_data);
+ umct_set_lcr(sc, lcr_data);
if (sc->sc_intr_number != -1 && sc->sc_intr_pipe == NULL) {
sc->sc_status = 0; /* clear status bit */
Index: src/sys/dev/usb/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.65.14.1 src/sys/dev/usb/umidi.c:1.65.14.2
--- src/sys/dev/usb/umidi.c:1.65.14.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/umidi.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.65.14.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: umidi.c,v 1.65.14.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.65.14.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.65.14.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -495,7 +495,7 @@ alloc_pipe(struct umidi_endpoint *ep)
ep->buffer_size -= ep->buffer_size % UMIDI_PACKET_SIZE;
DPRINTF(("%s: alloc_pipe %p, buffer size %u\n",
- device_xname(sc->sc_dev), ep, ep->buffer_size));
+ device_xname(sc->sc_dev), ep, ep->buffer_size));
ep->num_scheduled = 0;
ep->this_schedule = 0;
ep->next_schedule = 0;
@@ -1065,7 +1065,7 @@ assign_all_jacks_automatically(struct um
++ asg_spec;
} else {
out = (i<sc->sc_out_num_jacks) ? &sc->sc_out_jacks[i]
- : NULL;
+ : NULL;
in = (i<sc->sc_in_num_jacks) ? &sc->sc_in_jacks[i]
: NULL;
}
@@ -1432,7 +1432,7 @@ start_input_transfer(struct umidi_endpoi
(usbd_private_handle)ep,
ep->buffer, ep->buffer_size,
USBD_SHORT_XFER_OK | USBD_NO_COPY,
- USBD_NO_TIMEOUT, in_intr);
+ USBD_NO_TIMEOUT, in_intr);
return usbd_transfer(ep->xfer);
}
@@ -1590,13 +1590,13 @@ in_intr(usbd_xfer_handle xfer, usbd_priv
mutex_enter(&sc->sc_lock);
usbd_get_xfer_status(xfer, NULL, NULL, &count, NULL);
- if (0 == count % UMIDI_PACKET_SIZE) {
+ if (0 == count % UMIDI_PACKET_SIZE) {
DPRINTFN(200,("%s: input endpoint %p transfer length %u\n",
device_xname(ep->sc->sc_dev), ep, count));
- } else {
- DPRINTF(("%s: input endpoint %p odd transfer length %u\n",
- device_xname(ep->sc->sc_dev), ep, count));
- }
+ } else {
+ DPRINTF(("%s: input endpoint %p odd transfer length %u\n",
+ device_xname(ep->sc->sc_dev), ep, count));
+ }
slot = ep->buffer;
end = slot + count / sizeof *slot;
@@ -1615,7 +1615,7 @@ in_intr(usbd_xfer_handle xfer, usbd_priv
/* 0 <= cn <= 15 by inspection of above code */
if (!(jack = ep->jacks[cn]) || cn != jack->cable_number) {
DPRINTF(("%s: stray input endpoint %p cable %d len %d: "
- "%02X %02X %02X (try CN_SEQ quirk?)\n",
+ "%02X %02X %02X (try CN_SEQ quirk?)\n",
device_xname(ep->sc->sc_dev), ep, cn, len,
(unsigned)data[0],
(unsigned)data[1],
@@ -1628,7 +1628,7 @@ in_intr(usbd_xfer_handle xfer, usbd_priv
continue;
DPRINTFN(500,("%s: input endpoint %p cable %d len %d: "
- "%02X %02X %02X\n",
+ "%02X %02X %02X\n",
device_xname(ep->sc->sc_dev), ep, cn, len,
(unsigned)data[0],
(unsigned)data[1],
@@ -1663,14 +1663,14 @@ out_intr(usbd_xfer_handle xfer, usbd_pri
microtime(&umidi_tv);
#endif
usbd_get_xfer_status(xfer, NULL, NULL, &count, NULL);
- if ( 0 == count % UMIDI_PACKET_SIZE ) {
+ if ( 0 == count % UMIDI_PACKET_SIZE ) {
DPRINTFN(200,("%s: %"PRIu64".%06"PRIu64"s out ep %p xfer length %u\n",
device_xname(ep->sc->sc_dev),
umidi_tv.tv_sec%100, (uint64_t)umidi_tv.tv_usec, ep, count));
- } else {
- DPRINTF(("%s: output endpoint %p odd transfer length %u\n",
- device_xname(ep->sc->sc_dev), ep, count));
- }
+ } else {
+ DPRINTF(("%s: output endpoint %p odd transfer length %u\n",
+ device_xname(ep->sc->sc_dev), ep, count));
+ }
count /= UMIDI_PACKET_SIZE;
/*
Index: src/sys/dev/usb/umidi_quirks.h
diff -u src/sys/dev/usb/umidi_quirks.h:1.8.60.1 src/sys/dev/usb/umidi_quirks.h:1.8.60.2
--- src/sys/dev/usb/umidi_quirks.h:1.8.60.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/umidi_quirks.h Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi_quirks.h,v 1.8.60.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: umidi_quirks.h,v 1.8.60.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@ struct umidi_quirk {
int product;
int iface;
const struct umq_data *quirks;
- uint32_t type_mask;
+ uint32_t type_mask;
};
#define UMQ_ISTYPE(q, type) \
((q)->sc_quirk && ((q)->sc_quirk->type_mask & (1<<((type)-1))))
Index: src/sys/dev/usb/ums.c
diff -u src/sys/dev/usb/ums.c:1.87.6.1 src/sys/dev/usb/ums.c:1.87.6.2
--- src/sys/dev/usb/ums.c:1.87.6.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/ums.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.87.6.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ums.c,v 1.87.6.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.87.6.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.87.6.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -163,7 +163,7 @@ ums_match(device_t parent, cfdata_t matc
!hid_is_collection(desc, size, uha->reportid,
HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_POINTER)) &&
!hid_is_collection(desc, size, uha->reportid,
- HID_USAGE2(HUP_DIGITIZERS, 0x0002)))
+ HID_USAGE2(HUP_DIGITIZERS, 0x0002)))
return (UMATCH_NONE);
return (UMATCH_IFACECLASS);
Index: src/sys/dev/usb/uplcom.c
diff -u src/sys/dev/usb/uplcom.c:1.74.4.1 src/sys/dev/usb/uplcom.c:1.74.4.2
--- src/sys/dev/usb/uplcom.c:1.74.4.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/uplcom.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.74.4.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: uplcom.c,v 1.74.4.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.74.4.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.74.4.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -239,7 +239,7 @@ uplcom_attach(device_t parent, device_t
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
- sc->sc_udev = dev;
+ sc->sc_udev = dev;
DPRINTF(("\n\nuplcom attach: sc=%p\n", sc));
@@ -438,12 +438,12 @@ uplcom_detach(device_t self, int flags)
DPRINTF(("uplcom_detach: sc=%p flags=%d\n", sc, flags));
- if (sc->sc_intr_pipe != NULL) {
- usbd_abort_pipe(sc->sc_intr_pipe);
- usbd_close_pipe(sc->sc_intr_pipe);
+ if (sc->sc_intr_pipe != NULL) {
+ usbd_abort_pipe(sc->sc_intr_pipe);
+ usbd_close_pipe(sc->sc_intr_pipe);
free(sc->sc_intr_buf, M_USBDEV);
- sc->sc_intr_pipe = NULL;
- }
+ sc->sc_intr_pipe = NULL;
+ }
sc->sc_dying = 1;
if (sc->sc_subdev != NULL)
@@ -475,13 +475,13 @@ uplcom_reset(struct uplcom_softc *sc)
usb_device_request_t req;
usbd_status err;
- req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
- req.bRequest = UPLCOM_SET_REQUEST;
- USETW(req.wValue, 0);
- USETW(req.wIndex, sc->sc_iface_number);
- USETW(req.wLength, 0);
+ req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
+ req.bRequest = UPLCOM_SET_REQUEST;
+ USETW(req.wValue, 0);
+ USETW(req.wIndex, sc->sc_iface_number);
+ USETW(req.wLength, 0);
- err = usbd_do_request(sc->sc_udev, &req, 0);
+ err = usbd_do_request(sc->sc_udev, &req, 0);
if (err)
return (EIO);
Index: src/sys/dev/usb/usb_mem.h
diff -u src/sys/dev/usb/usb_mem.h:1.30.14.1 src/sys/dev/usb/usb_mem.h:1.30.14.2
--- src/sys/dev/usb/usb_mem.h:1.30.14.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/usb_mem.h Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.h,v 1.30.14.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: usb_mem.h,v 1.30.14.2 2014/11/30 13:14:11 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.9 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -34,12 +34,12 @@
typedef struct usb_dma_block {
bus_dma_tag_t tag;
bus_dmamap_t map;
- void *kaddr;
- bus_dma_segment_t *segs;
- int nsegs;
- int nsegs_alloc;
- size_t size;
- size_t align;
+ void *kaddr;
+ bus_dma_segment_t *segs;
+ int nsegs;
+ int nsegs_alloc;
+ size_t size;
+ size_t align;
int flags;
#define USB_DMA_FULLBLOCK 0x0001
#define USB_DMA_RESERVE 0x0002
Index: src/sys/dev/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.81.2.1 src/sys/dev/usb/usb_quirks.c:1.81.2.2
--- src/sys/dev/usb/usb_quirks.c:1.81.2.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/usb_quirks.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.81.2.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.81.2.2 2014/11/30 13:14:11 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.81.2.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.81.2.2 2014/11/30 13:14:11 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -93,9 +93,9 @@ Static const struct usbd_quirk_entry {
{ USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_T720C,
0x001, { UQ_ASSUME_CM_OVER_DATA }},
{ USB_VENDOR_EICON, USB_PRODUCT_EICON_DIVA852,
- 0x100, { UQ_ASSUME_CM_OVER_DATA }},
+ 0x100, { UQ_ASSUME_CM_OVER_DATA }},
{ USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_MC75,
- 0x000, { UQ_ASSUME_CM_OVER_DATA }},
+ 0x000, { UQ_ASSUME_CM_OVER_DATA }},
{ USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1, 0x009, { UQ_AU_NO_FRAC }},
{ USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPHONE,
0x100, { UQ_AU_INP_ASYNC }},
Index: src/sys/dev/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.162.2.1 src/sys/dev/usb/usbdi.c:1.162.2.2
--- src/sys/dev/usb/usbdi.c:1.162.2.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/usbdi.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.162.2.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: usbdi.c,v 1.162.2.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.2 2014/11/30 13:14:11 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1221,8 +1221,8 @@ usb_desc_iter_init(usbd_device_handle de
{
const usb_config_descriptor_t *cd = usbd_get_config_descriptor(dev);
- iter->cur = (const uByte *)cd;
- iter->end = (const uByte *)cd + UGETW(cd->wTotalLength);
+ iter->cur = (const uByte *)cd;
+ iter->end = (const uByte *)cd + UGETW(cd->wTotalLength);
}
const usb_descriptor_t *
Index: src/sys/dev/usb/usbdi_util.c
diff -u src/sys/dev/usb/usbdi_util.c:1.63.2.1 src/sys/dev/usb/usbdi_util.c:1.63.2.2
--- src/sys/dev/usb/usbdi_util.c:1.63.2.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/usbdi_util.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.c,v 1.63.2.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: usbdi_util.c,v 1.63.2.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.63.2.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.63.2.2 2014/11/30 13:14:11 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -455,7 +455,7 @@ usb_detach_wait(device_t dv, kcondvar_t
DPRINTF(("usb_detach_wait: waiting for %s\n", device_xname(dv)));
if (cv_timedwait(cv, lock, hz * 60)) // dv, PZERO, "usbdet", hz * 60
printf("usb_detach_wait: %s didn't detach\n",
- device_xname(dv));
+ device_xname(dv));
DPRINTF(("usb_detach_wait: %s done\n", device_xname(dv)));
}
@@ -472,7 +472,7 @@ usb_detach_waitold(device_t dv)
DPRINTF(("usb_detach_waitold: waiting for %s\n", device_xname(dv)));
if (tsleep(dv, PZERO, "usbdet", hz * 60)) /* XXXSMP ok */
printf("usb_detach_waitold: %s didn't detach\n",
- device_xname(dv));
+ device_xname(dv));
DPRINTF(("usb_detach_waitold: %s done\n", device_xname(dv)));
}
Index: src/sys/dev/usb/uscanner.c
diff -u src/sys/dev/usb/uscanner.c:1.75.4.1 src/sys/dev/usb/uscanner.c:1.75.4.2
--- src/sys/dev/usb/uscanner.c:1.75.4.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/uscanner.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.75.4.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: uscanner.c,v 1.75.4.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.75.4.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.75.4.2 2014/11/30 13:14:11 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -336,7 +336,7 @@ uscanner_attach(device_t parent, device_
ed_bulkin = ed;
} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT
&& (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) {
- ed_bulkout = ed;
+ ed_bulkout = ed;
}
if (ed_bulkin && ed_bulkout) /* found all we need */
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.38.6.1 src/sys/dev/usb/usscanner.c:1.38.6.2
--- src/sys/dev/usb/usscanner.c:1.38.6.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/usscanner.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.38.6.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: usscanner.c,v 1.38.6.2 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.38.6.1 2014/11/30 12:18:58 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.38.6.2 2014/11/30 13:14:11 skrll Exp $");
#include "scsibus.h"
#include <sys/param.h>
@@ -285,7 +285,7 @@ usscanner_attach(device_t parent, device
aprint_error_dev(self, "alloc intr xfer failed, err=%d\n", err);
usscanner_cleanup(sc);
return;
- }
+ }
sc->sc_data_xfer = usbd_alloc_xfer(uaa->device);
if (sc->sc_data_xfer == NULL) {
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.32 src/sys/external/bsd/dwc2/dwc2.c:1.32.2.1
--- src/sys/external/bsd/dwc2/dwc2.c:1.32 Tue Sep 2 23:26:20 2014
+++ src/sys/external/bsd/dwc2/dwc2.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.32 2014/09/02 23:26:20 macallan Exp $ */
+/* $NetBSD: dwc2.c,v 1.32.2.1 2014/11/30 13:14:11 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32 2014/09/02 23:26:20 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.32.2.1 2014/11/30 13:14:11 skrll Exp $");
#include "opt_usb.h"
@@ -240,15 +240,15 @@ dwc2_allocm(struct usbd_bus *bus, usb_dm
Static void
dwc2_freem(struct usbd_bus *bus, usb_dma_t *dma)
{
- struct dwc2_softc *sc = DWC2_BUS2SC(bus);
+ struct dwc2_softc *sc = DWC2_BUS2SC(bus);
DPRINTFN(10, "\n");
- if (dma->block->flags & USB_DMA_RESERVE) {
- usb_reserve_freem(&sc->sc_dma_reserve, dma);
- return;
- }
- usb_freemem(&sc->sc_bus, dma);
+ if (dma->block->flags & USB_DMA_RESERVE) {
+ usb_reserve_freem(&sc->sc_dma_reserve, dma);
+ return;
+ }
+ usb_freemem(&sc->sc_bus, dma);
}
usbd_xfer_handle
@@ -1228,7 +1228,7 @@ dwc2_device_start(usbd_xfer_handle xfer)
struct dwc2_pipe *dpipe = DWC2_XFER2DPIPE(xfer);
struct dwc2_softc *sc = DWC2_XFER2SC(xfer);
struct dwc2_hsotg *hsotg = sc->sc_hsotg;
- struct dwc2_hcd_urb *dwc2_urb;
+ struct dwc2_hcd_urb *dwc2_urb;
usbd_device_handle dev = xfer->pipe->device;
usb_endpoint_descriptor_t *ed = xfer->pipe->endpoint->edesc;
@@ -1672,7 +1672,7 @@ int dwc2_host_get_speed(struct dwc2_hsot
* Must be called with interrupt disabled and spinlock held
*/
void dwc2_host_complete(struct dwc2_hsotg *hsotg, struct dwc2_qtd *qtd,
- int status)
+ int status)
{
usbd_xfer_handle xfer;
struct dwc2_xfer *dxfer;
Index: src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c
diff -u src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c:1.1 src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c:1.1.12.1
--- src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c:1.1 Thu Sep 19 17:55:22 2013
+++ src/sys/rump/dev/lib/libugenhc/ugenhc_dma.c Sun Nov 30 13:14:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ugenhc_dma.c,v 1.1 2013/09/19 17:55:22 pooka Exp $ */
+/* $NetBSD: ugenhc_dma.c,v 1.1.12.1 2014/11/30 13:14:11 skrll Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -94,7 +94,7 @@ bus_dmamem_free(bus_dma_tag_t a, bus_dma
int
bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs, int nsegs,
- size_t size, void **kvap, int flags)
+ size_t size, void **kvap, int flags)
{
KASSERT(nsegs == 1);
