Module Name: src Committed By: christos Date: Sat Jan 5 01:30:18 UTC 2013
Modified Files: src/sys/dev/usb: ehci.c ezload.c if_atu.c if_aue.c if_axe.c if_cdce.c if_cue.c if_kue.c if_rum.c if_run.c if_udav.c if_upl.c if_ural.c if_url.c if_urtw.c if_urtwn.c ohci.c uatp.c ugen.c uhci.c uhid.c uhso.c uhub.c ukbd.c umass_scsipi.c ums.c usb.c usb_quirks.c usb_subr.c usbdi.c usbdi_util.c uthum.c uts.c uvideo.c uyurex.c Log Message: - need opt_usb.h if depending on USB_DEBUG - remove trailing whitespace - add missing KERNEL_RCSID To generate a diff of this commit: cvs rdiff -u -r1.194 -r1.195 src/sys/dev/usb/ehci.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/ezload.c cvs rdiff -u -r1.45 -r1.46 src/sys/dev/usb/if_atu.c src/sys/dev/usb/if_url.c cvs rdiff -u -r1.128 -r1.129 src/sys/dev/usb/if_aue.c cvs rdiff -u -r1.61 -r1.62 src/sys/dev/usb/if_axe.c cvs rdiff -u -r1.37 -r1.38 src/sys/dev/usb/if_cdce.c src/sys/dev/usb/uvideo.c cvs rdiff -u -r1.64 -r1.65 src/sys/dev/usb/if_cue.c cvs rdiff -u -r1.78 -r1.79 src/sys/dev/usb/if_kue.c cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/if_rum.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/if_run.c cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/if_udav.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/if_upl.c cvs rdiff -u -r1.41 -r1.42 src/sys/dev/usb/if_ural.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/if_urtw.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/if_urtwn.c cvs rdiff -u -r1.227 -r1.228 src/sys/dev/usb/ohci.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/uatp.c src/sys/dev/usb/uts.c cvs rdiff -u -r1.121 -r1.122 src/sys/dev/usb/ugen.c cvs rdiff -u -r1.249 -r1.250 src/sys/dev/usb/uhci.c cvs rdiff -u -r1.88 -r1.89 src/sys/dev/usb/uhid.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/uhso.c cvs rdiff -u -r1.119 -r1.120 src/sys/dev/usb/uhub.c cvs rdiff -u -r1.124 -r1.125 src/sys/dev/usb/ukbd.c cvs rdiff -u -r1.46 -r1.47 src/sys/dev/usb/umass_scsipi.c cvs rdiff -u -r1.84 -r1.85 src/sys/dev/usb/ums.c cvs rdiff -u -r1.136 -r1.137 src/sys/dev/usb/usb.c cvs rdiff -u -r1.75 -r1.76 src/sys/dev/usb/usb_quirks.c cvs rdiff -u -r1.185 -r1.186 src/sys/dev/usb/usb_subr.c cvs rdiff -u -r1.140 -r1.141 src/sys/dev/usb/usbdi.c cvs rdiff -u -r1.57 -r1.58 src/sys/dev/usb/usbdi_util.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/uthum.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/uyurex.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/ehci.c diff -u src/sys/dev/usb/ehci.c:1.194 src/sys/dev/usb/ehci.c:1.195 --- src/sys/dev/usb/ehci.c:1.194 Wed Jan 2 04:49:14 2013 +++ src/sys/dev/usb/ehci.c Fri Jan 4 20:30:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.194 2013/01/02 09:49:14 skrll Exp $ */ +/* $NetBSD: ehci.c,v 1.195 2013/01/05 01:30:15 christos Exp $ */ /* * Copyright (c) 2004-2012 The NetBSD Foundation, Inc. @@ -53,11 +53,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.194 2013/01/02 09:49:14 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.195 2013/01/05 01:30:15 christos Exp $"); #include "ohci.h" #include "uhci.h" +#ifdef _KERNEL_OPT #include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/systm.h> @@ -1493,12 +1495,12 @@ ehci_dump_sqtds(ehci_soft_qtd_t *sqtd) for (i = 0; sqtd && i < 20 && !stop; sqtd = sqtd->nextqtd, i++) { ehci_dump_sqtd(sqtd); usb_syncmem(&sqtd->dma, - sqtd->offs + offsetof(ehci_qtd_t, qtd_next), + sqtd->offs + offsetof(ehci_qtd_t, qtd_next), sizeof(sqtd->qtd), BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); stop = sqtd->qtd.qtd_next & htole32(EHCI_LINK_TERMINATE); usb_syncmem(&sqtd->dma, - sqtd->offs + offsetof(ehci_qtd_t, qtd_next), + sqtd->offs + offsetof(ehci_qtd_t, qtd_next), sizeof(sqtd->qtd), BUS_DMASYNC_PREREAD); } if (sqtd) @@ -1508,11 +1510,11 @@ ehci_dump_sqtds(ehci_soft_qtd_t *sqtd) Static void ehci_dump_sqtd(ehci_soft_qtd_t *sqtd) { - usb_syncmem(&sqtd->dma, sqtd->offs, + usb_syncmem(&sqtd->dma, sqtd->offs, sizeof(sqtd->qtd), BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); printf("QTD(%p) at 0x%08x:\n", sqtd, sqtd->physaddr); ehci_dump_qtd(&sqtd->qtd); - usb_syncmem(&sqtd->dma, sqtd->offs, + usb_syncmem(&sqtd->dma, sqtd->offs, sizeof(sqtd->qtd), BUS_DMASYNC_PREREAD); } @@ -1544,7 +1546,7 @@ ehci_dump_sqh(ehci_soft_qh_t *sqh) ehci_qh_t *qh = &sqh->qh; u_int32_t endp, endphub; - usb_syncmem(&sqh->dma, sqh->offs, + usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh), BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); printf("QH(%p) at 0x%08x:\n", sqh, sqh->physaddr); printf(" link="); ehci_dump_link(qh->qh_link, 1); printf("\n"); @@ -1566,7 +1568,7 @@ ehci_dump_sqh(ehci_soft_qh_t *sqh) printf(" curqtd="); ehci_dump_link(qh->qh_curqtd, 0); printf("\n"); printf("Overlay qTD:\n"); ehci_dump_qtd(&qh->qh_qtd); - usb_syncmem(&sqh->dma, sqh->offs, + usb_syncmem(&sqh->dma, sqh->offs, sizeof(sqh->qh), BUS_DMASYNC_PREREAD); } @@ -2368,7 +2370,7 @@ ehci_root_ctrl_start(usbd_xfer_handle xf * If we are doing embedded transaction translation, * then directly attached LS/FS devices are reset by * the EHCI controller itself. PSPD is encoded - * the same way as in USBSTATUS. + * the same way as in USBSTATUS. */ i = __SHIFTOUT(v, EHCI_PS_PSPD) * UPS_LOW_SPEED; } @@ -4059,7 +4061,7 @@ ehci_device_isoc_start(usbd_xfer_handle */ itd->itd.itd_ctl[j] = htole32 ( EHCI_ITD_ACTIVE | - EHCI_ITD_SET_LEN(xfer->frlengths[trans_count]) | + EHCI_ITD_SET_LEN(xfer->frlengths[trans_count]) | EHCI_ITD_SET_PG(addr) | EHCI_ITD_SET_OFFS(EHCI_PAGE_OFFSET(DMAADDR(dma_buf,offs)))); @@ -4071,7 +4073,7 @@ ehci_device_isoc_start(usbd_xfer_handle itd->itd.itd_ctl[j] |= htole32(EHCI_ITD_IOC); break; } - } + } /* Step 1.75, set buffer pointers. To simplify matters, all * pointers are filled out for the next 7 hardware pages in @@ -4111,7 +4113,7 @@ ehci_device_isoc_start(usbd_xfer_handle EHCI_ITD_SET_MAXPKT(UE_GET_SIZE(j))); /* FIXME: handle invalid trans */ - itd->itd.itd_bufr[2] |= + itd->itd.itd_bufr[2] |= htole32(EHCI_ITD_SET_MULTI(UE_GET_TRANS(j)+1)); usb_syncmem(&itd->dma, Index: src/sys/dev/usb/ezload.c diff -u src/sys/dev/usb/ezload.c:1.13 src/sys/dev/usb/ezload.c:1.14 --- src/sys/dev/usb/ezload.c:1.13 Sat Mar 10 20:06:06 2012 +++ src/sys/dev/usb/ezload.c Fri Jan 4 20:30:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ezload.c,v 1.13 2012/03/11 01:06:06 mrg Exp $ */ +/* $NetBSD: ezload.c,v 1.14 2013/01/05 01:30:15 christos Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.13 2012/03/11 01:06:06 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.14 2013/01/05 01:30:15 christos Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/usb/if_atu.c diff -u src/sys/dev/usb/if_atu.c:1.45 src/sys/dev/usb/if_atu.c:1.46 --- src/sys/dev/usb/if_atu.c:1.45 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_atu.c Fri Jan 4 20:30:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_atu.c,v 1.45 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_atu.c,v 1.46 2013/01/05 01:30:15 christos Exp $ */ /* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */ /* * Copyright (c) 2003, 2004 @@ -48,8 +48,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.45 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.46 2013/01/05 01:30:15 christos Exp $"); +#ifdef _KERNEL_OPT +#include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/sockio.h> Index: src/sys/dev/usb/if_url.c diff -u src/sys/dev/usb/if_url.c:1.45 src/sys/dev/usb/if_url.c:1.46 --- src/sys/dev/usb/if_url.c:1.45 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_url.c Fri Jan 4 20:30:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_url.c,v 1.45 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_url.c,v 1.46 2013/01/05 01:30:16 christos Exp $ */ /* * Copyright (c) 2001, 2002 @@ -44,9 +44,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.45 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.46 2013/01/05 01:30:16 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_inet.h" +#endif #include <sys/param.h> #include <sys/systm.h> @@ -165,7 +167,7 @@ static const struct url_type { /* Probe */ -int +int url_match(device_t parent, cfdata_t match, void *aux) { struct usb_attach_arg *uaa = aux; @@ -174,7 +176,7 @@ url_match(device_t parent, cfdata_t matc UMATCH_VENDOR_PRODUCT : UMATCH_NONE); } /* Attach */ -void +void url_attach(device_t parent, device_t self, void *aux) { struct url_softc *sc = device_private(self); @@ -329,7 +331,7 @@ url_attach(device_t parent, device_t sel } /* detach */ -int +int url_detach(device_t self, int flags) { struct url_softc *sc = device_private(self); @@ -1580,4 +1582,3 @@ url_ext_miibus_writereg(device_t dev, in return; } #endif - Index: src/sys/dev/usb/if_aue.c diff -u src/sys/dev/usb/if_aue.c:1.128 src/sys/dev/usb/if_aue.c:1.129 --- src/sys/dev/usb/if_aue.c:1.128 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_aue.c Fri Jan 4 20:30:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_aue.c,v 1.128 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_aue.c,v 1.129 2013/01/05 01:30:15 christos Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -78,9 +78,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.128 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.129 2013/01/05 01:30:15 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_inet.h" +#endif #include <sys/param.h> #include <sys/systm.h> @@ -687,9 +689,9 @@ aue_match(device_t parent, cfdata_t matc { struct usb_attach_arg *uaa = aux; - /* + /* * Some manufacturers use the same vendor and product id for - * different devices. We need to sanity check the DeviceClass + * different devices. We need to sanity check the DeviceClass * in this case * Currently known guilty products: * 0x050d/0x0121 Belkin Bluetooth and USB2LAN @@ -700,13 +702,13 @@ aue_match(device_t parent, cfdata_t matc if (uaa->vendor == USB_VENDOR_BELKIN && uaa->product == USB_PRODUCT_BELKIN_USB2LAN) { usb_device_descriptor_t *dd; - + dd = usbd_get_device_descriptor(uaa->device); if (dd != NULL && dd->bDeviceClass != UDCLASS_IN_INTERFACE) return (UMATCH_NONE); } - + return (aue_lookup(uaa->vendor, uaa->product) != NULL ? UMATCH_VENDOR_PRODUCT : UMATCH_NONE); } Index: src/sys/dev/usb/if_axe.c diff -u src/sys/dev/usb/if_axe.c:1.61 src/sys/dev/usb/if_axe.c:1.62 --- src/sys/dev/usb/if_axe.c:1.61 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_axe.c Fri Jan 4 20:30:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_axe.c,v 1.61 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_axe.c,v 1.62 2013/01/05 01:30:15 christos Exp $ */ /* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */ /* @@ -89,9 +89,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.61 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.62 2013/01/05 01:30:15 christos Exp $"); -#if defined(_KERNEL_OPT) +#ifdef _KERNEL_OPT #include "opt_inet.h" #endif @@ -924,8 +924,8 @@ axe_rxeof(usbd_xfer_handle xfer, usbd_pr buf += sizeof(hdr); if (((le16toh(hdr.len) & AXE_RH1M_RXLEN_MASK) ^ - (le16toh(hdr.ilen) & AXE_RH1M_RXLEN_MASK)) != - AXE_RH1M_RXLEN_MASK) { + (le16toh(hdr.ilen) & AXE_RH1M_RXLEN_MASK)) != + AXE_RH1M_RXLEN_MASK) { ifp->if_ierrors++; goto done; } Index: src/sys/dev/usb/if_cdce.c diff -u src/sys/dev/usb/if_cdce.c:1.37 src/sys/dev/usb/if_cdce.c:1.38 --- src/sys/dev/usb/if_cdce.c:1.37 Thu Apr 5 12:31:53 2012 +++ src/sys/dev/usb/if_cdce.c Fri Jan 4 20:30:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cdce.c,v 1.37 2012/04/05 16:31:53 plunky Exp $ */ +/* $NetBSD: if_cdce.c,v 1.38 2013/01/05 01:30:15 christos Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wp...@windriver.com> @@ -41,9 +41,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.37 2012/04/05 16:31:53 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.38 2013/01/05 01:30:15 christos Exp $"); -#if defined(_KERNEL_OPT) +#ifdef _KERNEL_OPT #include "opt_inet.h" #endif Index: src/sys/dev/usb/uvideo.c diff -u src/sys/dev/usb/uvideo.c:1.37 src/sys/dev/usb/uvideo.c:1.38 --- src/sys/dev/usb/uvideo.c:1.37 Thu Dec 22 19:51:49 2011 +++ src/sys/dev/usb/uvideo.c Fri Jan 4 20:30:18 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: uvideo.c,v 1.37 2011/12/23 00:51:49 jakllsch Exp $ */ +/* $NetBSD: uvideo.c,v 1.38 2013/01/05 01:30:18 christos Exp $ */ /* * Copyright (c) 2008 Patrick Mahoney @@ -42,7 +42,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.37 2011/12/23 00:51:49 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.38 2013/01/05 01:30:18 christos Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_uvideo.h" +#endif #ifdef _MODULE #include <sys/module.h> @@ -77,10 +81,6 @@ __KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1 #include <dev/usb/uvideoreg.h> -#if defined(_KERNEL_OPT) -#include "opt_uvideo.h" -#endif - #define UVIDEO_NXFERS 3 #define PRI_UVIDEO PRI_BIO @@ -247,7 +247,7 @@ struct uvideo_softc { char *sc_devname; device_t sc_videodev; - + int sc_dying; uvideo_state sc_state; @@ -467,7 +467,7 @@ static void print_vs_format_dv_descripto } while (0) -int +int uvideo_match(device_t parent, cfdata_t match, void *aux) { struct usbif_attach_arg *uaa = aux; @@ -483,7 +483,7 @@ uvideo_match(device_t parent, cfdata_t m return UMATCH_NONE; } -void +void uvideo_attach(device_t parent, device_t self, void *aux) { struct uvideo_softc *sc = device_private(self); @@ -500,7 +500,7 @@ uvideo_attach(device_t parent, device_t aprint_naive("\n"); aprint_normal(": %s\n", sc->sc_devname); - + sc->sc_udev = uaa->device; sc->sc_iface = uaa->iface; sc->sc_ifaceno = uaa->ifaceno; @@ -608,7 +608,7 @@ uvideo_attach(device_t parent, device_t } - + usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev, sc->sc_dev); @@ -634,7 +634,7 @@ int uvideo_activate(device_t self, enum devact act) { struct uvideo_softc *sc = device_private(self); - + switch (act) { case DVACT_DEACTIVATE: DPRINTF(("uvideo_activate: deactivating\n")); @@ -666,7 +666,7 @@ uvideo_detach(device_t self, int flags) sc = device_private(self); rv = 0; - + sc->sc_dying = 1; pmf_device_deregister(self); @@ -708,7 +708,7 @@ static struct uvideo_stream * uvideo_find_stream(struct uvideo_softc *sc, uint8_t ifaceno) { struct uvideo_stream *vs; - + SLIST_FOREACH(vs, &sc->sc_stream_list, entries) { if (vs->vs_ifaceno == ifaceno) return vs; @@ -727,7 +727,7 @@ uvideo_stream_find_format(struct uvideo_ uint8_t format_index, uint8_t frame_index) { struct uvideo_format *format; - + SIMPLEQ_FOREACH(format, &vs->vs_formats, entries) { if (UVIDEO_FORMAT_GET_FORMAT_INDEX(format) == format_index && UVIDEO_FORMAT_GET_FRAME_INDEX(format) == frame_index) @@ -775,10 +775,10 @@ uvideo_init_control(struct uvideo_softc const uvideo_descriptor_t *uvdesc; usbd_desc_iter_t orig; uint8_t i, j, nunits; - + /* save original iterator state */ memcpy(&orig, iter, sizeof(orig)); - + /* count number of units and terminals */ nunits = 0; while ((desc = usb_desc_iter_next_non_interface(iter)) != NULL) { @@ -805,7 +805,7 @@ uvideo_init_control(struct uvideo_softc /* restore original iterator state */ memcpy(iter, &orig, sizeof(orig)); - + /* iterate again, initializing the units */ i = 0; while ((desc = usb_desc_iter_next_non_interface(iter)) != NULL) { @@ -823,7 +823,7 @@ uvideo_init_control(struct uvideo_softc goto enomem; ++i; } - + return USBD_NORMAL_COMPLETION; enomem: @@ -836,7 +836,7 @@ enomem: sc->sc_unit = NULL; } sc->sc_nunits = 0; - + return USBD_NOMEM; } @@ -856,7 +856,7 @@ uvideo_unit_alloc(const uvideo_descripto { struct uvideo_unit *vu; usbd_status err; - + if (desc->bDescriptorType != UDESC_CS_INTERFACE) return NULL; @@ -881,7 +881,7 @@ uvideo_unit_init(struct uvideo_unit *vu, struct uvideo_camera_terminal *ct; struct uvideo_processing_unit *pu; struct uvideo_extension_unit *xu; - + const uvideo_input_terminal_descriptor_t *input; const uvideo_output_terminal_descriptor_t *output; const uvideo_camera_terminal_descriptor_t *camera; @@ -899,7 +899,7 @@ uvideo_unit_init(struct uvideo_unit *vu, camera = (const uvideo_camera_terminal_descriptor_t *)desc; ct = &vu->u.vu_camera; - + ct->ct_objective_focal_min = UGETW(camera->wObjectiveFocalLengthMin); ct->ct_objective_focal_max = @@ -970,7 +970,7 @@ uvideo_unit_alloc_sources(struct uvideo_ uint8_t nsrcs, const uint8_t *src_ids) { vu->vu_nsrcs = nsrcs; - + if (nsrcs == 0) { /* do nothing */ } else if (nsrcs == 1) { @@ -1090,7 +1090,7 @@ uvideo_stream_init(struct uvideo_stream " len %d, using default\n", UGETW(len))); vs->vs_probelen = 26; } - + return USBD_NORMAL_COMPLETION; } @@ -1119,7 +1119,7 @@ uvideo_stream_init_desc(struct uvideo_st * interface. */ while ((desc = usb_desc_iter_next_non_interface(iter)) != NULL) { uvdesc = (const uvideo_descriptor_t *)desc; - + switch (uvdesc->bDescriptorType) { case UDESC_ENDPOINT: bmAttributes = GET(usb_endpoint_descriptor_t, @@ -1170,7 +1170,7 @@ uvideo_stream_init_desc(struct uvideo_st GET(usb_endpoint_descriptor_t, desc, bInterval); - alt->max_packet_size = + alt->max_packet_size = UE_GET_SIZE(UGETW(GET(usb_endpoint_descriptor_t, desc, wMaxPacketSize))); alt->max_packet_size *= @@ -1346,7 +1346,7 @@ uvideo_stream_init_frame_based_format(st DPRINTF(("uvideo: failed to alloc video format\n")); return USBD_NOMEM; } - + format->format.pixel_format = pixel_format; switch (format_desc->bDescriptorSubtype) { @@ -1457,7 +1457,7 @@ uvideo_stream_init_frame_based_format(st } } - + return USBD_NORMAL_COMPLETION; } @@ -1554,7 +1554,7 @@ uvideo_stream_start_xfer(struct uvideo_s alt_maybe->max_packet_size >= alt->max_packet_size) alt = alt_maybe; } - + if (alt == NULL) { DPRINTF(("uvideo_stream_start_xfer: " "no suitable alternate interface found\n")); @@ -1565,7 +1565,7 @@ uvideo_stream_start_xfer(struct uvideo_s "choosing alternate interface " "%d wMaxPacketSize=%d bInterval=%d\n", alt->altno, alt->max_packet_size, alt->interval)); - + err = usbd_set_interface(vs->vs_iface, alt->altno); if (err != USBD_NORMAL_COMPLETION) { DPRINTF(("uvideo_stream_start_xfer: " @@ -1580,7 +1580,7 @@ uvideo_stream_start_xfer(struct uvideo_s nframes = (vframe_len + uframe_len - 1) / uframe_len; nframes = (nframes + 7) & ~7; /*round up for ehci inefficiency*/ DPRINTF(("uvideo_stream_start_xfer: nframes=%d\n", nframes)); - + ix->ix_nframes = nframes; ix->ix_uframe_len = uframe_len; for (i = 0; i < UVIDEO_NXFERS; i++) { @@ -1595,7 +1595,7 @@ uvideo_stream_start_xfer(struct uvideo_s return ENOMEM; } } - + err = usbd_open_pipe(vs->vs_iface, ix->ix_endpt, USBD_EXCLUSIVE_USE, &ix->ix_pipe); if (err != USBD_NORMAL_COMPLETION) { @@ -1739,7 +1739,7 @@ uvideo_stream_recv_isoc_start1(struct uv int i; ix = isoc->i_ix; - + for (i = 0; i < ix->ix_nframes; ++i) isoc->i_frlengths[i] = ix->ix_uframe_len; @@ -1813,7 +1813,7 @@ uvideo_stream_recv_isoc_complete(usbd_xf if (status != USBD_NORMAL_COMPLETION) { DPRINTF(("uvideo_stream_recv_isoc_complete: status=%s (%d)\n", usbd_errstr(status), status)); - + if (status == USBD_STALLED) usbd_clear_endpoint_stall_async(ix->ix_pipe); else @@ -1825,9 +1825,9 @@ uvideo_stream_recv_isoc_complete(usbd_xf /* DPRINTF(("uvideo: zero length transfer\n")); */ goto next; } - + hdr = (const uvideo_payload_header_t *)isoc->i_buf; - + for (i = 0, buf = isoc->i_buf; i < ix->ix_nframes; ++i, buf += ix->ix_uframe_len) @@ -1911,7 +1911,7 @@ uvideo_close(void *addr) struct uvideo_softc *sc; sc = addr; - + if (sc->sc_state != UVIDEO_STATE_CLOSED) { sc->sc_state = UVIDEO_STATE_CLOSED; } @@ -1968,7 +1968,7 @@ uvideo_get_format(void *addr, struct vid *format = vs->vs_current_format; return 0; -} +} /* * uvideo_set_format - TODO: this is boken and does nothing @@ -2088,7 +2088,7 @@ uvideo_set_format(void *addr, struct vid *format = uvfmt->format; vs->vs_current_format = *format; DPRINTF(("uvideo_set_format: pixeltype is %d\n", format->pixel_format)); - + return 0; } @@ -2157,7 +2157,7 @@ uvideo_get_control_group(void *addr, str case VIDEO_CONTROL_PANTILT_RELATIVE: if (group->length != 4) return EINVAL; - + return EINVAL; case VIDEO_CONTROL_SHARPNESS: if (group->length != 1) @@ -2213,17 +2213,17 @@ uvideo_set_control_group(void *addr, con int s; sc = addr; - + switch (group->group_id) { case VIDEO_CONTROL_PANTILT_RELATIVE: if (group->length != 4) return EINVAL; - + if (group->control[0].value != 0 || group->control[0].value != 1 || group->control[0].value != 0xff) return ERANGE; - + if (group->control[2].value != 0 || group->control[2].value != 1 || group->control[2].value != 0xff) @@ -2291,7 +2291,7 @@ uvideo_stream_probe_and_commit(struct uv void *data) { usb_device_request_t req; - + switch (action) { case UR_SET_CUR: req.bmRequestType = UT_WRITE_CLASS_INTERFACE; @@ -2317,7 +2317,7 @@ uvideo_stream_probe_and_commit(struct uv "unknown request action %d\n", action)); return USBD_NOT_STARTED; } - + req.bRequest = action; USETW2(req.wValue, control, 0); USETW2(req.wIndex, 0, vs->vs_ifaceno); @@ -2339,13 +2339,13 @@ uvideo_init_probe_data(uvideo_probe_and_ MODULE(MODULE_CLASS_DRIVER, uvideo, NULL); static const struct cfiattrdata videobuscf_iattrdata = { - "videobus", 0, { + "videobus", 0, { { NULL, NULL, 0 }, } }; static const struct cfiattrdata * const uvideo_attrs[] = { &videobuscf_iattrdata, NULL -}; +}; CFDRIVER_DECL(uvideo, DV_DULL, uvideo_attrs); extern struct cfattach uvideo_ca; extern struct cfattach uvideo_ca; @@ -2371,7 +2371,7 @@ uvideo_modcmd(modcmd_t cmd, void *arg) { int err; - + switch (cmd) { case MODULE_CMD_INIT: DPRINTF(("uvideo: attempting to load\n")); @@ -2444,7 +2444,7 @@ print_descriptor(const usb_descriptor_t } printf(" "); /* indent */ - + if (current_class == UICLASS_VIDEO) { switch (current_subclass) { case UISUBCLASS_VIDEOCONTROL: @@ -2472,7 +2472,7 @@ print_vc_descriptor(const usb_descriptor const uvideo_descriptor_t *vcdesc; printf("VC "); - + switch (desc->bDescriptorType) { case UDESC_ENDPOINT: print_endpoint_descriptor( @@ -2683,7 +2683,7 @@ print_input_terminal_descriptor( desc->bAssocTerminal, desc->iTerminal); } - + static void print_output_terminal_descriptor( const uvideo_output_terminal_descriptor_t *desc) @@ -2780,7 +2780,7 @@ print_extension_unit_descriptor( const uByte * byte; uByte controlbytes; int i; - + printf("Extension Unit: " "Len=%d Type=0x%02x Subtype=0x%02x " "bUnitID=%d ", @@ -2801,7 +2801,7 @@ print_extension_unit_descriptor( byte = &desc->baSourceID[0]; for (i = 0; i < desc->bNrInPins; ++i) printf("%d ", *byte++); - + controlbytes = *byte++; printf("bControlSize=%d ", controlbytes); printf("bmControls="); @@ -2984,7 +2984,7 @@ static const usb_descriptor_t * usb_desc_iter_peek_next(usbd_desc_iter_t *iter) { const usb_descriptor_t *desc; - + if (iter->cur + sizeof(usb_descriptor_t) >= iter->end) { if (iter->cur != iter->end) printf("usb_desc_iter_peek_next: bad descriptor\n"); Index: src/sys/dev/usb/if_cue.c diff -u src/sys/dev/usb/if_cue.c:1.64 src/sys/dev/usb/if_cue.c:1.65 --- src/sys/dev/usb/if_cue.c:1.64 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_cue.c Fri Jan 4 20:30:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_cue.c,v 1.64 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_cue.c,v 1.65 2013/01/05 01:30:15 christos Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wp...@ee.columbia.edu>. All rights reserved. @@ -56,9 +56,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.64 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.65 2013/01/05 01:30:15 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_inet.h" +#endif #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/usb/if_kue.c diff -u src/sys/dev/usb/if_kue.c:1.78 src/sys/dev/usb/if_kue.c:1.79 --- src/sys/dev/usb/if_kue.c:1.78 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_kue.c Fri Jan 4 20:30:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_kue.c,v 1.78 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_kue.c,v 1.79 2013/01/05 01:30:15 christos Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -71,9 +71,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.78 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.79 2013/01/05 01:30:15 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_inet.h" +#endif #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/usb/if_rum.c diff -u src/sys/dev/usb/if_rum.c:1.44 src/sys/dev/usb/if_rum.c:1.45 --- src/sys/dev/usb/if_rum.c:1.44 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_rum.c Fri Jan 4 20:30:16 2013 @@ -1,5 +1,5 @@ /* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */ -/* $NetBSD: if_rum.c,v 1.44 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_rum.c,v 1.45 2013/01/05 01:30:16 christos Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergam...@free.fr> @@ -24,8 +24,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.44 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.45 2013/01/05 01:30:16 christos Exp $"); +#ifdef _KERNEL_OPT +#include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/sockio.h> Index: src/sys/dev/usb/if_run.c diff -u src/sys/dev/usb/if_run.c:1.5 src/sys/dev/usb/if_run.c:1.6 --- src/sys/dev/usb/if_run.c:1.5 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_run.c Fri Jan 4 20:30:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_run.c,v 1.5 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_run.c,v 1.6 2013/01/05 01:30:16 christos Exp $ */ /* $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */ /*- @@ -23,7 +23,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.5 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.6 2013/01/05 01:30:16 christos Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/sockio.h> Index: src/sys/dev/usb/if_udav.c diff -u src/sys/dev/usb/if_udav.c:1.39 src/sys/dev/usb/if_udav.c:1.40 --- src/sys/dev/usb/if_udav.c:1.39 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_udav.c Fri Jan 4 20:30:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_udav.c,v 1.39 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_udav.c,v 1.40 2013/01/05 01:30:16 christos Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* @@ -45,9 +45,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.39 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.40 2013/01/05 01:30:16 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_inet.h" +#endif #include <sys/param.h> #include <sys/systm.h> @@ -167,7 +169,7 @@ static const struct udav_type { /* Probe */ -int +int udav_match(device_t parent, cfdata_t match, void *aux) { struct usb_attach_arg *uaa = aux; @@ -177,7 +179,7 @@ udav_match(device_t parent, cfdata_t mat } /* Attach */ -void +void udav_attach(device_t parent, device_t self, void *aux) { struct udav_softc *sc = device_private(self); @@ -324,7 +326,7 @@ udav_attach(device_t parent, device_t se } /* detach */ -int +int udav_detach(device_t self, int flags) { struct udav_softc *sc = device_private(self); Index: src/sys/dev/usb/if_upl.c diff -u src/sys/dev/usb/if_upl.c:1.43 src/sys/dev/usb/if_upl.c:1.44 --- src/sys/dev/usb/if_upl.c:1.43 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_upl.c Fri Jan 4 20:30:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_upl.c,v 1.43 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_upl.c,v 1.44 2013/01/05 01:30:16 christos Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. @@ -34,9 +34,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.43 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.44 2013/01/05 01:30:16 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_inet.h" +#endif #include <sys/param.h> #include <sys/systm.h> @@ -198,7 +200,7 @@ Static void upl_input(struct ifnet *, st /* * Probe for a Prolific chip. */ -int +int upl_match(device_t parent, cfdata_t match, void *aux) { struct usb_attach_arg *uaa = aux; @@ -211,7 +213,7 @@ upl_match(device_t parent, cfdata_t matc return (UMATCH_NONE); } -void +void upl_attach(device_t parent, device_t self, void *aux) { struct upl_softc *sc = device_private(self); @@ -320,7 +322,7 @@ upl_attach(device_t parent, device_t sel return; } -int +int upl_detach(device_t self, int flags) { struct upl_softc *sc = device_private(self); Index: src/sys/dev/usb/if_ural.c diff -u src/sys/dev/usb/if_ural.c:1.41 src/sys/dev/usb/if_ural.c:1.42 --- src/sys/dev/usb/if_ural.c:1.41 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_ural.c Fri Jan 4 20:30:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ural.c,v 1.41 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_ural.c,v 1.42 2013/01/05 01:30:16 christos Exp $ */ /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */ /*- @@ -24,8 +24,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.41 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.42 2013/01/05 01:30:16 christos Exp $"); +#ifdef _KERNEL_OPT +#include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/sockio.h> @@ -356,7 +359,7 @@ int ural_activate(device_t, extern struct cfdriver ural_cd; CFATTACH_DECL_NEW(ural, sizeof(struct ural_softc), ural_match, ural_attach, ural_detach, ural_activate); -int +int ural_match(device_t parent, cfdata_t match, void *aux) { struct usb_attach_arg *uaa = aux; @@ -365,7 +368,7 @@ ural_match(device_t parent, cfdata_t mat UMATCH_VENDOR_PRODUCT : UMATCH_NONE; } -void +void ural_attach(device_t parent, device_t self, void *aux) { struct ural_softc *sc = device_private(self); @@ -532,7 +535,7 @@ ural_attach(device_t parent, device_t se return; } -int +int ural_detach(device_t self, int flags) { struct ural_softc *sc = device_private(self); Index: src/sys/dev/usb/if_urtw.c diff -u src/sys/dev/usb/if_urtw.c:1.2 src/sys/dev/usb/if_urtw.c:1.3 --- src/sys/dev/usb/if_urtw.c:1.2 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_urtw.c Fri Jan 4 20:30:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_urtw.c,v 1.2 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_urtw.c,v 1.3 2013/01/05 01:30:16 christos Exp $ */ /* $OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */ /*- @@ -19,7 +19,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.2 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.3 2013/01/05 01:30:16 christos Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/sockio.h> Index: src/sys/dev/usb/if_urtwn.c diff -u src/sys/dev/usb/if_urtwn.c:1.6 src/sys/dev/usb/if_urtwn.c:1.7 --- src/sys/dev/usb/if_urtwn.c:1.6 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/if_urtwn.c Fri Jan 4 20:30:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_urtwn.c,v 1.6 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: if_urtwn.c,v 1.7 2013/01/05 01:30:16 christos Exp $ */ /* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */ /*- @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.6 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.7 2013/01/05 01:30:16 christos Exp $"); #include <sys/param.h> #include <sys/sockio.h> @@ -1490,7 +1490,7 @@ urtwn_newstate_cb(struct urtwn_softc *sc R92C_RCR_CBSSID_DATA | R92C_RCR_CBSSID_BCN); } break; - + case IEEE80211_S_AUTH: case IEEE80211_S_ASSOC: break; @@ -3561,7 +3561,7 @@ urtwn_init(struct ifnet *ifp) default: reg = RW(reg, R92C_CR_NETTYPE, R92C_CR_NETTYPE_INFRA); break; - + case IEEE80211_M_IBSS: reg = RW(reg, R92C_CR_NETTYPE, R92C_CR_NETTYPE_ADHOC); break; Index: src/sys/dev/usb/ohci.c diff -u src/sys/dev/usb/ohci.c:1.227 src/sys/dev/usb/ohci.c:1.228 --- src/sys/dev/usb/ohci.c:1.227 Wed Jan 2 04:50:26 2013 +++ src/sys/dev/usb/ohci.c Fri Jan 4 20:30:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.227 2013/01/02 09:50:26 skrll Exp $ */ +/* $NetBSD: ohci.c,v 1.228 2013/01/05 01:30:16 christos Exp $ */ /* * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc. @@ -41,9 +41,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.227 2013/01/02 09:50:26 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.228 2013/01/05 01:30:16 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/usb/uatp.c diff -u src/sys/dev/usb/uatp.c:1.1 src/sys/dev/usb/uatp.c:1.2 --- src/sys/dev/usb/uatp.c:1.1 Sat Aug 4 00:34:55 2012 +++ src/sys/dev/usb/uatp.c Fri Jan 4 20:30:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: uatp.c,v 1.1 2012/08/04 04:34:55 riastradh Exp $ */ +/* $NetBSD: uatp.c,v 1.2 2013/01/05 01:30:16 christos Exp $ */ /*- * Copyright (c) 2011, 2012 Taylor R. Campbell @@ -143,7 +143,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.1 2012/08/04 04:34:55 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.2 2013/01/05 01:30:16 christos Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_uatp_debug.h" +#endif #include <sys/atomic.h> #include <sys/device.h> @@ -171,12 +175,6 @@ extern int hz; #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsmousevar.h> -#if 1 -# define UATP_DEBUG 1 -#else -# include "opt_uatp_debug.h" -#endif - #define CHECK(condition, fail) do { \ if (! (condition)) { \ aprint_error_dev(uatp_dev(sc), "%s: check failed: %s\n",\ Index: src/sys/dev/usb/uts.c diff -u src/sys/dev/usb/uts.c:1.1 src/sys/dev/usb/uts.c:1.2 --- src/sys/dev/usb/uts.c:1.1 Mon Jan 16 22:49:20 2012 +++ src/sys/dev/usb/uts.c Fri Jan 4 20:30:18 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: uts.c,v 1.1 2012/01/17 03:49:20 christos Exp $ */ +/* $NetBSD: uts.c,v 1.2 2013/01/05 01:30:18 christos Exp $ */ /* * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -34,7 +34,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.1 2012/01/17 03:49:20 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.2 2013/01/05 01:30:18 christos Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/usb/ugen.c diff -u src/sys/dev/usb/ugen.c:1.121 src/sys/dev/usb/ugen.c:1.122 --- src/sys/dev/usb/ugen.c:1.121 Tue Dec 4 00:50:57 2012 +++ src/sys/dev/usb/ugen.c Fri Jan 4 20:30:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ugen.c,v 1.121 2012/12/04 05:50:57 riastradh Exp $ */ +/* $NetBSD: ugen.c,v 1.122 2013/01/05 01:30:16 christos Exp $ */ /* * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -37,9 +37,11 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.121 2012/12/04 05:50:57 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.122 2013/01/05 01:30:16 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" +#endif #include <sys/param.h> #include <sys/systm.h> @@ -175,7 +177,7 @@ CFATTACH_DECL_NEW(ugen, sizeof(struct ug /* toggle to control attach priority. -1 means "let autoconf decide" */ int ugen_override = -1; -int +int ugen_match(device_t parent, cfdata_t match, void *aux) { struct usb_attach_arg *uaa = aux; @@ -194,7 +196,7 @@ ugen_match(device_t parent, cfdata_t mat return (UMATCH_NONE); } -void +void ugen_attach(device_t parent, device_t self, void *aux) { struct ugen_softc *sc = device_private(self); @@ -671,7 +673,7 @@ ugen_do_read(struct ugen_softc *sc, int sce->cur = sce->ibuf; } - /* + /* * If the transfers stopped because the * buffer was full, restart them. */ @@ -843,7 +845,7 @@ ugen_do_write(struct ugen_softc *sc, int return (EWOULDBLOCK); } while (uio->uio_resid > 0 && !error) { - while (sce->ra_wb_used == + while (sce->ra_wb_used == sce->limit - sce->ibuf) { sce->state |= UGEN_ASLP; DPRINTFN(5, @@ -1004,7 +1006,7 @@ ugen_activate(device_t self, enum devact } } -int +int ugen_detach(device_t self, int flags) { struct ugen_softc *sc = device_private(self); @@ -1259,7 +1261,7 @@ ugen_bulkwb_intr(usbd_xfer_handle xfer, /* Update buffer pointers. */ sce->cur += count; if (sce->cur >= sce->limit) - sce->cur = sce->ibuf + (sce->cur - sce->limit); + sce->cur = sce->ibuf + (sce->cur - sce->limit); /* Set up next request if necessary. */ if (sce->ra_wb_used > 0) { @@ -1560,7 +1562,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int sce->state &= ~UGEN_BULK_WB; /* * XXX Discard whatever's in the buffer, but we - * should keep it around and keep writing to + * should keep it around and keep writing to * drain the buffer instead. */ usbd_abort_pipe(sce->pipeh); @@ -1588,7 +1590,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int opt->ra_wb_request_size < 1 || opt->ra_wb_request_size > opt->ra_wb_buffer_size) return (EINVAL); - /* + /* * XXX These changes do not take effect until the * next time RA/WB mode is enabled but they ought to * take effect immediately. Index: src/sys/dev/usb/uhci.c diff -u src/sys/dev/usb/uhci.c:1.249 src/sys/dev/usb/uhci.c:1.250 --- src/sys/dev/usb/uhci.c:1.249 Sun Jun 24 06:06:34 2012 +++ src/sys/dev/usb/uhci.c Fri Jan 4 20:30:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: uhci.c,v 1.249 2012/06/24 10:06:34 drochner Exp $ */ +/* $NetBSD: uhci.c,v 1.250 2013/01/05 01:30:17 christos Exp $ */ /* * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc. @@ -42,9 +42,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.249 2012/06/24 10:06:34 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.250 2013/01/05 01:30:17 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/systm.h> @@ -816,7 +818,7 @@ uhci_dump_td(uhci_soft_td_t *p) { char sbuf[128], sbuf2[128]; - + usb_syncmem(&p->dma, p->offs, sizeof(p->td), BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); DPRINTFN(-1,("TD(%p) at %08lx = link=0x%08lx status=0x%08lx " @@ -2675,7 +2677,7 @@ uhci_device_isoc_enter(usbd_xfer_handle next = 0; len = xfer->frlengths[i]; std->td.td_buffer = htole32(buf); - usb_syncmem(&xfer->dmabuf, offs, len, + usb_syncmem(&xfer->dmabuf, offs, len, rd ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE); if (i == nframes - 1) status |= UHCI_TD_IOC; @@ -3024,7 +3026,7 @@ uhci_device_intr_done(usbd_xfer_handle x uhci_free_std_chain(sc, ii->stdstart, NULL); isread = UE_GET_DIR(upipe->pipe.endpoint->edesc->bEndpointAddress) == UE_DIR_IN; - usb_syncmem(&xfer->dmabuf, 0, xfer->length, + usb_syncmem(&xfer->dmabuf, 0, xfer->length, isread ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE); /* XXX Wasteful. */ @@ -3108,7 +3110,7 @@ uhci_device_ctrl_done(usbd_xfer_handle x uhci_free_std_chain(sc, ii->stdstart->link.std, ii->stdend); if (len) { - usb_syncmem(&xfer->dmabuf, 0, len, + usb_syncmem(&xfer->dmabuf, 0, len, isread ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE); } usb_syncmem(&upipe->u.ctl.reqdma, 0, Index: src/sys/dev/usb/uhid.c diff -u src/sys/dev/usb/uhid.c:1.88 src/sys/dev/usb/uhid.c:1.89 --- src/sys/dev/usb/uhid.c:1.88 Sun Jun 10 02:15:54 2012 +++ src/sys/dev/usb/uhid.c Fri Jan 4 20:30:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: uhid.c,v 1.88 2012/06/10 06:15:54 mrg Exp $ */ +/* $NetBSD: uhid.c,v 1.89 2013/01/05 01:30:17 christos Exp $ */ /* * Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc. @@ -35,9 +35,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.88 2012/06/10 06:15:54 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.89 2013/01/05 01:30:17 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" +#endif #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/usb/uhso.c diff -u src/sys/dev/usb/uhso.c:1.10 src/sys/dev/usb/uhso.c:1.11 --- src/sys/dev/usb/uhso.c:1.10 Thu Dec 27 11:42:32 2012 +++ src/sys/dev/usb/uhso.c Fri Jan 4 20:30:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: uhso.c,v 1.10 2012/12/27 16:42:32 skrll Exp $ */ +/* $NetBSD: uhso.c,v 1.11 2013/01/05 01:30:17 christos Exp $ */ /*- * Copyright (c) 2009 Iain Hibbert @@ -37,9 +37,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.10 2012/12/27 16:42:32 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.11 2013/01/05 01:30:17 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_inet.h" +#endif #include <sys/param.h> #include <sys/conf.h> @@ -605,7 +607,7 @@ uhso_switch_mode(usbd_device_handle udev xfer = usbd_alloc_xfer(udev); if (xfer == NULL) return ENOMEM; - + USETDW(cmd.dCBWSignature, CBWSIGNATURE); USETDW(cmd.dCBWTag, 1); USETDW(cmd.dCBWDataTransferLength, 0); Index: src/sys/dev/usb/uhub.c diff -u src/sys/dev/usb/uhub.c:1.119 src/sys/dev/usb/uhub.c:1.120 --- src/sys/dev/usb/uhub.c:1.119 Wed Nov 14 08:53:23 2012 +++ src/sys/dev/usb/uhub.c Fri Jan 4 20:30:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: uhub.c,v 1.119 2012/11/14 13:53:23 skrll Exp $ */ +/* $NetBSD: uhub.c,v 1.120 2013/01/05 01:30:17 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */ /* @@ -36,9 +36,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.119 2012/11/14 13:53:23 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.120 2013/01/05 01:30:17 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/usb/ukbd.c diff -u src/sys/dev/usb/ukbd.c:1.124 src/sys/dev/usb/ukbd.c:1.125 --- src/sys/dev/usb/ukbd.c:1.124 Sun Jun 10 02:15:54 2012 +++ src/sys/dev/usb/ukbd.c Fri Jan 4 20:30:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ukbd.c,v 1.124 2012/06/10 06:15:54 mrg Exp $ */ +/* $NetBSD: ukbd.c,v 1.125 2013/01/05 01:30:17 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -35,7 +35,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.124 2012/06/10 06:15:54 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.125 2013/01/05 01:30:17 christos Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_ukbd.h" +#include "opt_ukbd_layout.h" +#include "opt_wsdisplay_compat.h" +#include "opt_ddb.h" +#endif /* _KERNEL_OPT */ #include <sys/param.h> #include <sys/systm.h> @@ -66,13 +73,6 @@ __KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.1 #include <dev/wscons/wsksymdef.h> #include <dev/wscons/wsksymvar.h> -#ifdef _KERNEL_OPT -#include "opt_ukbd.h" -#include "opt_ukbd_layout.h" -#include "opt_wsdisplay_compat.h" -#include "opt_ddb.h" -#endif /* _KERNEL_OPT */ - #ifdef UKBD_DEBUG #define DPRINTF(x) if (ukbddebug) printf x #define DPRINTFN(n,x) if (ukbddebug>(n)) printf x @@ -148,7 +148,7 @@ Static const struct ukbd_keycodetrans tr }; #ifdef GDIUM_KEYBOARD_HACK -Static const struct ukbd_keycodetrans trtab_gdium_fn[] = { +Static const struct ukbd_keycodetrans trtab_gdium_fn[] = { #ifdef notyet { 58, 0 }, /* F1 -> toggle camera */ { 59, 0 }, /* F2 -> toggle wireless */ Index: src/sys/dev/usb/umass_scsipi.c diff -u src/sys/dev/usb/umass_scsipi.c:1.46 src/sys/dev/usb/umass_scsipi.c:1.47 --- src/sys/dev/usb/umass_scsipi.c:1.46 Mon Aug 20 06:32:31 2012 +++ src/sys/dev/usb/umass_scsipi.c Fri Jan 4 20:30:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: umass_scsipi.c,v 1.46 2012/08/20 10:32:31 drochner Exp $ */ +/* $NetBSD: umass_scsipi.c,v 1.47 2013/01/05 01:30:17 christos Exp $ */ /* * Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc. @@ -31,10 +31,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.46 2012/08/20 10:32:31 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.47 2013/01/05 01:30:17 christos Exp $"); #ifdef _KERNEL_OPT #include "opt_umass.h" +#include "opt_usb.h" #endif #include "atapibus.h" Index: src/sys/dev/usb/ums.c diff -u src/sys/dev/usb/ums.c:1.84 src/sys/dev/usb/ums.c:1.85 --- src/sys/dev/usb/ums.c:1.84 Mon Apr 30 13:27:50 2012 +++ src/sys/dev/usb/ums.c Fri Jan 4 20:30:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ums.c,v 1.84 2012/04/30 17:27:50 christos Exp $ */ +/* $NetBSD: ums.c,v 1.85 2013/01/05 01:30:17 christos Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -35,7 +35,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.84 2012/04/30 17:27:50 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.85 2013/01/05 01:30:17 christos Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/systm.h> @@ -240,12 +244,12 @@ ums_attach(device_t parent, device_t sel } /* Try the wheel first as the Z activator since it's tradition. */ - hl = hid_locate(desc, - size, - HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL), - uha->reportid, - hid_input, - &sc->sc_loc_z, + hl = hid_locate(desc, + size, + HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_WHEEL), + uha->reportid, + hid_input, + &sc->sc_loc_z, &flags); zloc = &sc->sc_loc_z; @@ -264,8 +268,8 @@ ums_attach(device_t parent, device_t sel } } - hl = hid_locate(desc, - size, + hl = hid_locate(desc, + size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Z), uha->reportid, hid_input, @@ -278,9 +282,9 @@ ums_attach(device_t parent, device_t sel * any Z then check that. */ if (!hl) { - hl = hid_locate(desc, - size, - HID_USAGE2(HUP_CONSUMER, HUC_AC_PAN), + hl = hid_locate(desc, + size, + HID_USAGE2(HUP_CONSUMER, HUC_AC_PAN), uha->reportid, hid_input, zloc, @@ -307,7 +311,7 @@ ums_attach(device_t parent, device_t sel */ if (uha->uaa->vendor == USB_VENDOR_MICROSOFT && (uha->uaa->product == USB_PRODUCT_MICROSOFT_24GHZ_XCVR10 || - uha->uaa->product == USB_PRODUCT_MICROSOFT_24GHZ_XCVR20)) { + uha->uaa->product == USB_PRODUCT_MICROSOFT_24GHZ_XCVR20)) { if ((sc->flags & UMS_Z) && sc->sc_loc_z.pos == 0) sc->sc_loc_z.pos = 24; if ((sc->flags & UMS_W) && sc->sc_loc_w.pos == 0) @@ -322,7 +326,7 @@ ums_attach(device_t parent, device_t sel if (isdigitizer) { for (size_t j = 0; j < __arraycount(digbut); j++) { - if (hid_locate(desc, size, HID_USAGE2(HUP_DIGITIZERS, + if (hid_locate(desc, size, HID_USAGE2(HUP_DIGITIZERS, digbut[j].feature), uha->reportid, hid_input, &sc->sc_loc_btn[i - 1], 0)) { if (i <= MAX_BUTTONS) { Index: src/sys/dev/usb/usb.c diff -u src/sys/dev/usb/usb.c:1.136 src/sys/dev/usb/usb.c:1.137 --- src/sys/dev/usb/usb.c:1.136 Mon Nov 26 23:54:58 2012 +++ src/sys/dev/usb/usb.c Fri Jan 4 20:30:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: usb.c,v 1.136 2012/11/27 04:54:58 mrg Exp $ */ +/* $NetBSD: usb.c,v 1.137 2013/01/05 01:30:17 christos Exp $ */ /* * Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc. @@ -37,10 +37,12 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.136 2012/11/27 04:54:58 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.137 2013/01/05 01:30:17 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" #include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/systm.h> @@ -559,7 +561,7 @@ usbread(dev_t dev, struct uio *uio, int case USB_EVENT_DRIVER_DETACH: ueo->u.ue_driver.ue_cookie=ue->u.ue_driver.ue_cookie; memcpy(ueo->u.ue_driver.ue_devname, - ue->u.ue_driver.ue_devname, + ue->u.ue_driver.ue_devname, sizeof(ue->u.ue_driver.ue_devname)); break; default: @@ -1073,7 +1075,7 @@ usb_copy_old_devinfo(struct usb_device_i int i, n; uo->udi_bus = ue->udi_bus; - uo->udi_addr = ue->udi_addr; + uo->udi_addr = ue->udi_addr; uo->udi_cookie = ue->udi_cookie; for (i = 0, p = (const unsigned char *)ue->udi_product, q = (unsigned char *)uo->udi_product; @@ -1112,7 +1114,7 @@ usb_copy_old_devinfo(struct usb_device_i uo->udi_protocol = ue->udi_protocol; uo->udi_config = ue->udi_config; uo->udi_speed = ue->udi_speed; - uo->udi_power = ue->udi_power; + uo->udi_power = ue->udi_power; uo->udi_nports = ue->udi_nports; for (n=0; n<USB_MAX_DEVNAMES; n++) Index: src/sys/dev/usb/usb_quirks.c diff -u src/sys/dev/usb/usb_quirks.c:1.75 src/sys/dev/usb/usb_quirks.c:1.76 --- src/sys/dev/usb/usb_quirks.c:1.75 Fri May 25 12:33:54 2012 +++ src/sys/dev/usb/usb_quirks.c Fri Jan 4 20:30:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: usb_quirks.c,v 1.75 2012/05/25 16:33:54 buhrow Exp $ */ +/* $NetBSD: usb_quirks.c,v 1.76 2013/01/05 01:30:17 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */ /* @@ -32,13 +32,16 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.75 2012/05/25 16:33:54 buhrow Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.76 2013/01/05 01:30:17 christos Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/systm.h> #include <dev/usb/usb.h> - #include <dev/usb/usbdevs.h> #include <dev/usb/usb_quirks.h> @@ -61,7 +64,7 @@ Static const struct usbd_quirk_entry { { USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2, ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_MICROCHIP, USB_PRODUCT_MICROCHIP_PICKIT1, ANY, { UQ_HID_IGNORE }}, - { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_UPS, + { USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_UPS, ANY, { UQ_HID_IGNORE }}, { USB_VENDOR_MISC, USB_PRODUCT_MISC_WISPY_24X, ANY, { UQ_HID_IGNORE }}, Index: src/sys/dev/usb/usb_subr.c diff -u src/sys/dev/usb/usb_subr.c:1.185 src/sys/dev/usb/usb_subr.c:1.186 --- src/sys/dev/usb/usb_subr.c:1.185 Wed Jan 2 04:53:58 2013 +++ src/sys/dev/usb/usb_subr.c Fri Jan 4 20:30:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: usb_subr.c,v 1.185 2013/01/02 09:53:58 skrll Exp $ */ +/* $NetBSD: usb_subr.c,v 1.186 2013/01/05 01:30:17 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */ /* @@ -32,11 +32,13 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.185 2013/01/02 09:53:58 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.186 2013/01/05 01:30:17 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" #include "opt_usbverbose.h" #include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/usb/usbdi.c diff -u src/sys/dev/usb/usbdi.c:1.140 src/sys/dev/usb/usbdi.c:1.141 --- src/sys/dev/usb/usbdi.c:1.140 Tue Dec 4 10:10:04 2012 +++ src/sys/dev/usb/usbdi.c Fri Jan 4 20:30:17 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi.c,v 1.140 2012/12/04 15:10:04 skrll Exp $ */ +/* $NetBSD: usbdi.c,v 1.141 2013/01/05 01:30:17 christos Exp $ */ /* * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc. @@ -31,10 +31,12 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.140 2012/12/04 15:10:04 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.141 2013/01/05 01:30:17 christos Exp $"); +#ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" #include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/usb/usbdi_util.c diff -u src/sys/dev/usb/usbdi_util.c:1.57 src/sys/dev/usb/usbdi_util.c:1.58 --- src/sys/dev/usb/usbdi_util.c:1.57 Sun Jun 10 02:15:55 2012 +++ src/sys/dev/usb/usbdi_util.c Fri Jan 4 20:30:18 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi_util.c,v 1.57 2012/06/10 06:15:55 mrg Exp $ */ +/* $NetBSD: usbdi_util.c,v 1.58 2013/01/05 01:30:18 christos Exp $ */ /* * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc. @@ -31,7 +31,11 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.57 2012/06/10 06:15:55 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.58 2013/01/05 01:30:18 christos Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/systm.h> Index: src/sys/dev/usb/uthum.c diff -u src/sys/dev/usb/uthum.c:1.8 src/sys/dev/usb/uthum.c:1.9 --- src/sys/dev/usb/uthum.c:1.8 Thu Dec 22 19:51:49 2011 +++ src/sys/dev/usb/uthum.c Fri Jan 4 20:30:18 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: uthum.c,v 1.8 2011/12/23 00:51:49 jakllsch Exp $ */ +/* $NetBSD: uthum.c,v 1.9 2013/01/05 01:30:18 christos Exp $ */ /* $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $ */ /* @@ -17,7 +17,16 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* Driver for TEMPer and TEMPerHUM HID */ +/* + * Driver for TEMPer and TEMPerHUM HID + */ + +#include <sys/cdefs.h> +__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.9 2013/01/05 01:30:18 christos Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/proc.h> @@ -114,7 +123,7 @@ extern struct cfdriver uthum_cd; CFATTACH_DECL_NEW(uthum, sizeof(struct uthum_softc), uthum_match, uthum_attach, uthum_detach, uthum_activate); -int +int uthum_match(device_t parent, cfdata_t match, void *aux) { struct usb_attach_arg *uaa = aux; @@ -124,7 +133,7 @@ uthum_match(device_t parent, cfdata_t ma UMATCH_VENDOR_PRODUCT : UMATCH_NONE); } -void +void uthum_attach(device_t parent, device_t self, void *aux) { struct uthum_softc *sc = device_private(self); @@ -214,7 +223,7 @@ uthum_attach(device_t parent, device_t s DPRINTF(("uthum_attach: complete\n")); } -int +int uthum_detach(device_t self, int flags) { struct uthum_softc *sc = device_private(self); Index: src/sys/dev/usb/uyurex.c diff -u src/sys/dev/usb/uyurex.c:1.7 src/sys/dev/usb/uyurex.c:1.8 --- src/sys/dev/usb/uyurex.c:1.7 Thu Dec 22 19:51:50 2011 +++ src/sys/dev/usb/uyurex.c Fri Jan 4 20:30:18 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: uyurex.c,v 1.7 2011/12/23 00:51:50 jakllsch Exp $ */ +/* $NetBSD: uyurex.c,v 1.8 2013/01/05 01:30:18 christos Exp $ */ /* $OpenBSD: uyurex.c,v 1.3 2010/03/04 03:47:22 deraadt Exp $ */ /* @@ -17,7 +17,16 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* Driver for Maywa-Denki & KAYAC YUREX BBU sensor */ +/* + * Driver for Maywa-Denki & KAYAC YUREX BBU sensor + */ + +#include <sys/cdefs.h> +__KERNEL_RCSID(0, "$NetBSD: uyurex.c,v 1.8 2013/01/05 01:30:18 christos Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_usb.h" +#endif #include <sys/param.h> #include <sys/proc.h>