Module Name: src
Committed By: skrll
Date: Sat Dec 6 08:27:23 UTC 2014
Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c if_atu.c if_aue.c if_axe.c
if_axen.c if_rum.c if_upgt.c if_urtw.c ohci.c ubsavar.h ucomvar.h
ucycom.c udsbr.c uftdi.c ugen.c uhci.c uhid.c uhub.c uipaq.c
uirda.c uirdavar.h ukbd.c ulpt.c umass.c umass_isdata.h
umass_scsipi.c umass_scsipi.h umcs.c umct.c umodem_common.c
umodemvar.h ums.c uplcom.c usb_mem.h usbdi_util.h usbdivar.h
usscanner.c ustir.c uts.c uvideo.c
Log Message:
KNF. Remove argument name from function declarations.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.234.2.15 -r1.234.2.16 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.50.2.5 -r1.50.2.6 src/sys/dev/usb/if_atu.c
cvs rdiff -u -r1.132.4.4 -r1.132.4.5 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.67.4.2 -r1.67.4.3 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.3.6.2 -r1.3.6.3 src/sys/dev/usb/if_axen.c
cvs rdiff -u -r1.48.6.2 -r1.48.6.3 src/sys/dev/usb/if_rum.c
cvs rdiff -u -r1.12.4.2 -r1.12.4.3 src/sys/dev/usb/if_upgt.c
cvs rdiff -u -r1.6.6.3 -r1.6.6.4 src/sys/dev/usb/if_urtw.c
cvs rdiff -u -r1.254.2.14 -r1.254.2.15 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.9.24.1 -r1.9.24.2 src/sys/dev/usb/ubsavar.h
cvs rdiff -u -r1.20.24.1 -r1.20.24.2 src/sys/dev/usb/ucomvar.h
cvs rdiff -u -r1.41.2.3 -r1.41.2.4 src/sys/dev/usb/ucycom.c
cvs rdiff -u -r1.22.14.3 -r1.22.14.4 src/sys/dev/usb/udsbr.c
cvs rdiff -u -r1.59.6.3 -r1.59.6.4 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.126.2.5 -r1.126.2.6 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.264.4.14 -r1.264.4.15 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.92.4.4 -r1.92.4.5 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.126.2.4 -r1.126.2.5 src/sys/dev/usb/uhub.c
cvs rdiff -u -r1.19.14.2 -r1.19.14.3 src/sys/dev/usb/uipaq.c
cvs rdiff -u -r1.38.6.4 -r1.38.6.5 src/sys/dev/usb/uirda.c
cvs rdiff -u -r1.5.38.1 -r1.5.38.2 src/sys/dev/usb/uirdavar.h
cvs rdiff -u -r1.129.6.2 -r1.129.6.3 src/sys/dev/usb/ukbd.c
cvs rdiff -u -r1.95.4.4 -r1.95.4.5 src/sys/dev/usb/ulpt.c
cvs rdiff -u -r1.149.2.3 -r1.149.2.4 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.2 -r1.2.66.1 src/sys/dev/usb/umass_isdata.h \
src/sys/dev/usb/umass_scsipi.h
cvs rdiff -u -r1.49 -r1.49.2.1 src/sys/dev/usb/umass_scsipi.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/dev/usb/umcs.c
cvs rdiff -u -r1.32.24.5 -r1.32.24.6 src/sys/dev/usb/umct.c
cvs rdiff -u -r1.22.38.2 -r1.22.38.3 src/sys/dev/usb/umodem_common.c
cvs rdiff -u -r1.8 -r1.8.38.1 src/sys/dev/usb/umodemvar.h
cvs rdiff -u -r1.87.6.4 -r1.87.6.5 src/sys/dev/usb/ums.c
cvs rdiff -u -r1.74.4.4 -r1.74.4.5 src/sys/dev/usb/uplcom.c
cvs rdiff -u -r1.30.14.4 -r1.30.14.5 src/sys/dev/usb/usb_mem.h
cvs rdiff -u -r1.45.6.3 -r1.45.6.4 src/sys/dev/usb/usbdi_util.h
cvs rdiff -u -r1.109.2.7 -r1.109.2.8 src/sys/dev/usb/usbdivar.h
cvs rdiff -u -r1.38.6.5 -r1.38.6.6 src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.33.10.5 -r1.33.10.6 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.3.14.2 -r1.3.14.3 src/sys/dev/usb/uts.c
cvs rdiff -u -r1.41.2.4 -r1.41.2.5 src/sys/dev/usb/uvideo.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.234.2.15 src/sys/dev/usb/ehci.c:1.234.2.16
--- src/sys/dev/usb/ehci.c:1.234.2.15 Fri Dec 5 13:23:38 2014
+++ src/sys/dev/usb/ehci.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.234.2.15 2014/12/05 13:23:38 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.234.2.16 2014/12/06 08:27:23 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.15 2014/12/05 13:23:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.16 2014/12/06 08:27:23 skrll Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -212,8 +212,8 @@ Static void ehci_device_fs_isoc_abort(u
Static void ehci_device_fs_isoc_close(usbd_pipe_handle);
Static void ehci_device_fs_isoc_done(usbd_xfer_handle);
-Static void ehci_device_clear_toggle(usbd_pipe_handle pipe);
-Static void ehci_noop(usbd_pipe_handle pipe);
+Static void ehci_device_clear_toggle(usbd_pipe_handle);
+Static void ehci_noop(usbd_pipe_handle);
Static void ehci_disown(ehci_softc_t *, int, int);
@@ -228,21 +228,21 @@ Static usbd_status ehci_alloc_sqtd_chain
Static void ehci_free_sqtd_chain(ehci_softc_t *, ehci_soft_qtd_t *,
ehci_soft_qtd_t *);
-Static ehci_soft_itd_t *ehci_alloc_itd(ehci_softc_t *sc);
-Static ehci_soft_sitd_t *ehci_alloc_sitd(ehci_softc_t *sc);
-Static void ehci_free_itd(ehci_softc_t *sc, ehci_soft_itd_t *itd);
-Static void ehci_free_sitd(ehci_softc_t *sc, ehci_soft_sitd_t *);
-Static void ehci_rem_free_itd_chain(ehci_softc_t *sc,
- struct ehci_xfer *exfer);
-Static void ehci_rem_free_sitd_chain(ehci_softc_t *sc,
- struct ehci_xfer *exfer);
-Static void ehci_abort_isoc_xfer(usbd_xfer_handle xfer,
- usbd_status status);
+Static ehci_soft_itd_t *ehci_alloc_itd(ehci_softc_t *);
+Static ehci_soft_sitd_t *ehci_alloc_sitd(ehci_softc_t *);
+Static void ehci_free_itd(ehci_softc_t *, ehci_soft_itd_t *);
+Static void ehci_free_sitd(ehci_softc_t *, ehci_soft_sitd_t *);
+Static void ehci_rem_free_itd_chain(ehci_softc_t *,
+ struct ehci_xfer *);
+Static void ehci_rem_free_sitd_chain(ehci_softc_t *,
+ struct ehci_xfer *);
+Static void ehci_abort_isoc_xfer(usbd_xfer_handle,
+ usbd_status);
-Static usbd_status ehci_device_request(usbd_xfer_handle xfer);
+Static usbd_status ehci_device_request(usbd_xfer_handle);
Static usbd_status ehci_device_setintr(ehci_softc_t *, ehci_soft_qh_t *,
- int ival);
+ int);
Static void ehci_add_qh(ehci_softc_t *, ehci_soft_qh_t *,
ehci_soft_qh_t *);
@@ -265,7 +265,7 @@ Static void ehci_dump_sqtds(ehci_soft_q
Static void ehci_dump_sqtd(ehci_soft_qtd_t *);
Static void ehci_dump_qtd(ehci_qtd_t *);
Static void ehci_dump_sqh(ehci_soft_qh_t *);
-Static void ehci_dump_sitd(struct ehci_soft_itd *itd);
+Static void ehci_dump_sitd(struct ehci_soft_itd *);
Static void ehci_dump_itd(struct ehci_soft_itd *);
Static void ehci_dump_exfer(struct ehci_xfer *);
#endif
Index: src/sys/dev/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.50.2.5 src/sys/dev/usb/if_atu.c:1.50.2.6
--- src/sys/dev/usb/if_atu.c:1.50.2.5 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/if_atu.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.50.2.5 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: if_atu.c,v 1.50.2.6 2014/12/06 08:27:23 skrll Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.50.2.5 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.50.2.6 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -236,39 +236,39 @@ int atu_ioctl(struct ifnet *, u_long, vo
int atu_init(struct ifnet *);
void atu_stop(struct ifnet *, int);
void atu_watchdog(struct ifnet *);
-usbd_status atu_usb_request(struct atu_softc *sc, uint8_t type,
- uint8_t request, uint16_t value, uint16_t index,
- uint16_t length, uint8_t *data);
-int atu_send_command(struct atu_softc *sc, uint8_t *command, int size);
-int atu_get_cmd_status(struct atu_softc *sc, uint8_t cmd,
- uint8_t *status);
-int atu_wait_completion(struct atu_softc *sc, uint8_t cmd,
- uint8_t *status);
-int atu_send_mib(struct atu_softc *sc, uint8_t type,
- uint8_t size, uint8_t index, void *data);
-int atu_get_mib(struct atu_softc *sc, uint8_t type,
- uint8_t size, uint8_t index, uint8_t *buf);
+usbd_status atu_usb_request(struct atu_softc *, uint8_t,
+ uint8_t, uint16_t, uint16_t,
+ uint16_t, uint8_t *);
+int atu_send_command(struct atu_softc *, uint8_t *, int);
+int atu_get_cmd_status(struct atu_softc *, uint8_t,
+ uint8_t *);
+int atu_wait_completion(struct atu_softc *, uint8_t,
+ uint8_t *);
+int atu_send_mib(struct atu_softc *, uint8_t,
+ uint8_t, uint8_t, void *);
+int atu_get_mib(struct atu_softc *, uint8_t,
+ uint8_t, uint8_t, uint8_t *);
#if 0
-int atu_start_ibss(struct atu_softc *sc);
+int atu_start_ibss(struct atu_softc *);
#endif
-int atu_start_scan(struct atu_softc *sc);
-int atu_switch_radio(struct atu_softc *sc, int state);
-int atu_initial_config(struct atu_softc *sc);
-int atu_join(struct atu_softc *sc, struct ieee80211_node *node);
-int8_t atu_get_dfu_state(struct atu_softc *sc);
-uint8_t atu_get_opmode(struct atu_softc *sc, uint8_t *mode);
+int atu_start_scan(struct atu_softc *);
+int atu_switch_radio(struct atu_softc *, int);
+int atu_initial_config(struct atu_softc *);
+int atu_join(struct atu_softc *, struct ieee80211_node *);
+int8_t atu_get_dfu_state(struct atu_softc *);
+uint8_t atu_get_opmode(struct atu_softc *, uint8_t *);
void atu_internal_firmware(device_t);
void atu_external_firmware(device_t);
-int atu_get_card_config(struct atu_softc *sc);
-int atu_media_change(struct ifnet *ifp);
-void atu_media_status(struct ifnet *ifp, struct ifmediareq *req);
+int atu_get_card_config(struct atu_softc *);
+int atu_media_change(struct ifnet *);
+void atu_media_status(struct ifnet *, struct ifmediareq *);
int atu_tx_list_init(struct atu_softc *);
int atu_rx_list_init(struct atu_softc *);
-void atu_xfer_list_free(struct atu_softc *sc, struct atu_chain *ch,
- int listlen);
+void atu_xfer_list_free(struct atu_softc *, struct atu_chain *,
+ int);
#ifdef ATU_DEBUG
-void atu_debug_print(struct atu_softc *sc);
+void atu_debug_print(struct atu_softc *);
#endif
void atu_task(void *);
Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.132.4.4 src/sys/dev/usb/if_aue.c:1.132.4.5
--- src/sys/dev/usb/if_aue.c:1.132.4.4 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/if_aue.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.132.4.4 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: if_aue.c,v 1.132.4.5 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132.4.4 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.132.4.5 2014/12/06 08:27:23 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -218,7 +218,7 @@ CFATTACH_DECL_NEW(aue, sizeof(struct aue
Static void aue_multithread(void *);
-Static void aue_reset_pegasus_II(struct aue_softc *sc);
+Static void aue_reset_pegasus_II(struct aue_softc *);
Static int aue_tx_list_init(struct aue_softc *);
Static int aue_rx_list_init(struct aue_softc *);
Static int aue_newbuf(struct aue_softc *, struct aue_chain *, struct mbuf *);
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.67.4.2 src/sys/dev/usb/if_axe.c:1.67.4.3
--- src/sys/dev/usb/if_axe.c:1.67.4.2 Wed Dec 3 12:52:07 2014
+++ src/sys/dev/usb/if_axe.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.67.4.2 2014/12/03 12:52:07 skrll Exp $ */
+/* $NetBSD: if_axe.c,v 1.67.4.3 2014/12/06 08:27:23 skrll Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -89,7 +89,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67.4.2 2014/12/03 12:52:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.67.4.3 2014/12/06 08:27:23 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -201,13 +201,13 @@ static void axe_miibus_writereg_locked(d
static void axe_miibus_writereg(device_t, int, int, int);
static void axe_miibus_statchg(struct ifnet *);
static int axe_cmd(struct axe_softc *, int, int, int, void *);
-static void axe_reset(struct axe_softc *sc);
+static void axe_reset(struct axe_softc *);
static int axe_ifmedia_upd(struct ifnet *);
static void axe_ifmedia_sts(struct ifnet *, struct ifmediareq *);
static void axe_setmulti(struct axe_softc *);
-static void axe_lock_mii(struct axe_softc *sc);
-static void axe_unlock_mii(struct axe_softc *sc);
+static void axe_lock_mii(struct axe_softc *);
+static void axe_unlock_mii(struct axe_softc *);
static void axe_ax88178_init(struct axe_softc *);
static void axe_ax88772_init(struct axe_softc *);
Index: src/sys/dev/usb/if_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.3.6.2 src/sys/dev/usb/if_axen.c:1.3.6.3
--- src/sys/dev/usb/if_axen.c:1.3.6.2 Wed Dec 3 12:52:07 2014
+++ src/sys/dev/usb/if_axen.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axen.c,v 1.3.6.2 2014/12/03 12:52:07 skrll Exp $ */
+/* $NetBSD: if_axen.c,v 1.3.6.3 2014/12/06 08:27:23 skrll Exp $ */
/* $OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.3.6.2 2014/12/03 12:52:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.3.6.3 2014/12/06 08:27:23 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -110,14 +110,14 @@ static void axen_miibus_statchg(struct i
static int axen_cmd(struct axen_softc *, int, int, int, void *);
static int axen_ifmedia_upd(struct ifnet *);
static void axen_ifmedia_sts(struct ifnet *, struct ifmediareq *);
-static void axen_reset(struct axen_softc *sc);
+static void axen_reset(struct axen_softc *);
#if 0
static int axen_ax88179_eeprom(struct axen_softc *, void *);
#endif
static void axen_iff(struct axen_softc *);
-static void axen_lock_mii(struct axen_softc *sc);
-static void axen_unlock_mii(struct axen_softc *sc);
+static void axen_lock_mii(struct axen_softc *);
+static void axen_unlock_mii(struct axen_softc *);
static void axen_ax88179_init(struct axen_softc *);
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.48.6.2 src/sys/dev/usb/if_rum.c:1.48.6.3
--- src/sys/dev/usb/if_rum.c:1.48.6.2 Wed Dec 3 22:33:56 2014
+++ src/sys/dev/usb/if_rum.c Sat Dec 6 08:27:23 2014
@@ -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.48.6.2 2014/12/03 22:33:56 skrll Exp $ */
+/* $NetBSD: if_rum.c,v 1.48.6.3 2014/12/06 08:27:23 skrll Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <[email protected]>
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.48.6.2 2014/12/03 22:33:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.48.6.3 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -200,7 +200,7 @@ static void rum_amrr_start(struct rum_s
struct ieee80211_node *);
static void rum_amrr_timeout(void *);
static void rum_amrr_update(usbd_xfer_handle, usbd_private_handle,
- usbd_status status);
+ usbd_status);
/*
* Supported rates for 802.11a/b/g modes (in 500Kbps unit).
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.12.4.2 src/sys/dev/usb/if_upgt.c:1.12.4.3
--- src/sys/dev/usb/if_upgt.c:1.12.4.2 Tue Dec 2 09:00:33 2014
+++ src/sys/dev/usb/if_upgt.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.12.4.2 2014/12/02 09:00:33 skrll Exp $ */
+/* $NetBSD: if_upgt.c,v 1.12.4.3 2014/12/06 08:27:23 skrll Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.12.4.2 2014/12/02 09:00:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.12.4.3 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -123,7 +123,7 @@ static void upgt_rx_cb(usbd_xfer_handle,
static void upgt_rx(struct upgt_softc *, uint8_t *, int);
static void upgt_setup_rates(struct upgt_softc *);
static uint8_t upgt_rx_rate(struct upgt_softc *, const int);
-static int upgt_set_macfilter(struct upgt_softc *, uint8_t state);
+static int upgt_set_macfilter(struct upgt_softc *, uint8_t);
static int upgt_set_channel(struct upgt_softc *, unsigned);
static void upgt_set_led(struct upgt_softc *, int);
static void upgt_set_led_blink(void *);
Index: src/sys/dev/usb/if_urtw.c
diff -u src/sys/dev/usb/if_urtw.c:1.6.6.3 src/sys/dev/usb/if_urtw.c:1.6.6.4
--- src/sys/dev/usb/if_urtw.c:1.6.6.3 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/if_urtw.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtw.c,v 1.6.6.3 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: if_urtw.c,v 1.6.6.4 2014/12/06 08:27:23 skrll Exp $ */
/* $OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */
/*-
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.6.6.3 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.6.6.4 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -499,7 +499,7 @@ int urtw_newstate(struct ieee80211com *
void urtw_watchdog(struct ifnet *);
void urtw_set_chan(struct urtw_softc *, struct ieee80211_channel *);
int urtw_isbmode(uint16_t);
-uint16_t urtw_rate2rtl(int rate);
+uint16_t urtw_rate2rtl(int);
uint16_t urtw_rtl2rate(int);
usbd_status urtw_set_rate(struct urtw_softc *);
usbd_status urtw_update_msr(struct urtw_softc *);
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.254.2.14 src/sys/dev/usb/ohci.c:1.254.2.15
--- src/sys/dev/usb/ohci.c:1.254.2.14 Fri Dec 5 13:23:38 2014
+++ src/sys/dev/usb/ohci.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.254.2.14 2014/12/05 13:23:38 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.254.2.15 2014/12/06 08:27:23 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.14 2014/12/05 13:23:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.15 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -109,7 +109,7 @@ Static void ohci_poll(struct usbd_bus *
Static void ohci_softintr(void *);
Static void ohci_waitintr(ohci_softc_t *, usbd_xfer_handle);
Static void ohci_rhsc(ohci_softc_t *, usbd_xfer_handle);
-Static void ohci_rhsc_softint(void *arg);
+Static void ohci_rhsc_softint(void *);
Static usbd_status ohci_device_request(usbd_xfer_handle xfer);
Static void ohci_add_ed(ohci_softc_t *, ohci_soft_ed_t *,
@@ -124,7 +124,7 @@ Static void ohci_hash_add_itd(ohci_soft
Static void ohci_hash_rem_itd(ohci_softc_t *, ohci_soft_itd_t *);
Static ohci_soft_itd_t *ohci_hash_find_itd(ohci_softc_t *, ohci_physaddr_t);
-Static usbd_status ohci_setup_isoc(usbd_pipe_handle pipe);
+Static usbd_status ohci_setup_isoc(usbd_pipe_handle);
Static void ohci_device_isoc_enter(usbd_xfer_handle);
Static usbd_xfer_handle ohci_allocx(struct usbd_bus *);
@@ -163,8 +163,8 @@ Static void ohci_device_isoc_abort(usbd
Static void ohci_device_isoc_close(usbd_pipe_handle);
Static void ohci_device_isoc_done(usbd_xfer_handle);
-Static usbd_status ohci_device_setintr(ohci_softc_t *sc,
- struct ohci_pipe *pipe, int ival);
+Static usbd_status ohci_device_setintr(ohci_softc_t *,
+ struct ohci_pipe *, int);
Static void ohci_timeout(void *);
Static void ohci_timeout_task(void *);
@@ -173,8 +173,8 @@ Static void ohci_rhsc_enable(void *);
Static void ohci_close_pipe(usbd_pipe_handle, ohci_soft_ed_t *);
Static void ohci_abort_xfer(usbd_xfer_handle, usbd_status);
-Static void ohci_device_clear_toggle(usbd_pipe_handle pipe);
-Static void ohci_noop(usbd_pipe_handle pipe);
+Static void ohci_device_clear_toggle(usbd_pipe_handle);
+Static void ohci_noop(usbd_pipe_handle);
#ifdef OHCI_DEBUG
Static void ohci_dumpregs(ohci_softc_t *);
Index: src/sys/dev/usb/ubsavar.h
diff -u src/sys/dev/usb/ubsavar.h:1.9.24.1 src/sys/dev/usb/ubsavar.h:1.9.24.2
--- src/sys/dev/usb/ubsavar.h:1.9.24.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/ubsavar.h Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsavar.h,v 1.9.24.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ubsavar.h,v 1.9.24.2 2014/12/06 08:27:23 skrll Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
@@ -147,7 +147,7 @@ int ubsa_param(void *, int, struct term
int ubsa_open(void *, int);
void ubsa_close(void *, int);
-void ubsa_break(struct ubsa_softc *sc, int, int onoff);
+void ubsa_break(struct ubsa_softc *, int, int);
int ubsa_request(struct ubsa_softc *, int, uint8_t, uint16_t);
void ubsa_dtr(struct ubsa_softc *, int, int);
void ubsa_quadumts_dtr(struct ubsa_softc *, int, int);
Index: src/sys/dev/usb/ucomvar.h
diff -u src/sys/dev/usb/ucomvar.h:1.20.24.1 src/sys/dev/usb/ucomvar.h:1.20.24.2
--- src/sys/dev/usb/ucomvar.h:1.20.24.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/ucomvar.h Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ucomvar.h,v 1.20.24.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: ucomvar.h,v 1.20.24.2 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,27 +37,30 @@
struct ucom_softc;
struct ucom_methods {
- void (*ucom_get_status)(void *sc, int portno, u_char *lsr, u_char *msr);
- void (*ucom_set)(void *sc, int portno, int reg, int onoff);
+ void (*ucom_get_status)(void *, int, u_char *, u_char *);
+ void (*ucom_set)(void *, int, int, int);
#define UCOM_SET_DTR 1
#define UCOM_SET_RTS 2
#define UCOM_SET_BREAK 3
- int (*ucom_param)(void *sc, int portno, struct termios *);
- int (*ucom_ioctl)(void *sc, int portno, u_long cmd,
- void *data, int flag, proc_t *p);
- int (*ucom_open)(void *sc, int portno);
- void (*ucom_close)(void *sc, int portno);
+ int (*ucom_param)(void *, int, struct termios *);
+ int (*ucom_ioctl)(void *, int, u_long, void *, int, proc_t *);
+ int (*ucom_open)(void *, int);
+ void (*ucom_close)(void *, int);
/*
- * Note: The 'ptr' and 'count' pointers can be adjusted as follows:
- * ptr: If consuming characters from the start of the buffer,
- * advance '*ptr' to skip the data consumed.
- * count: If consuming characters at the end of the buffer,
- * decrement '*count' by the number of characters consumed.
+ * Note: The 'ptr' (2nd arg) and 'count' (3rd arg) pointers can be
+ * adjusted as follows:
+ *
+ * ptr: If consuming characters from the start of the buffer,
+ * advance '*ptr' to skip the data consumed.
+ *
+ * count: If consuming characters at the end of the buffer,
+ * decrement '*count' by the number of characters
+ * consumed.
+ *
* If consuming all characters, set '*count' to zero.
*/
- void (*ucom_read)(void *sc, int portno, u_char **ptr, uint32_t *count);
- void (*ucom_write)(void *sc, int portno, u_char *to, u_char *from,
- uint32_t *count);
+ void (*ucom_read)(void *, int, u_char **, uint32_t *);
+ void (*ucom_write)(void *, int, u_char *, u_char *, uint32_t *);
};
/* modem control register */
Index: src/sys/dev/usb/ucycom.c
diff -u src/sys/dev/usb/ucycom.c:1.41.2.3 src/sys/dev/usb/ucycom.c:1.41.2.4
--- src/sys/dev/usb/ucycom.c:1.41.2.3 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/ucycom.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ucycom.c,v 1.41.2.3 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: ucycom.c,v 1.41.2.4 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.41.2.3 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.41.2.4 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -174,7 +174,7 @@ Static void ucycom_dtr(struct ucycom_sof
#if 0
Static void ucycom_rts(struct ucycom_softc *, int);
#endif
-Static void ucycom_cleanup(struct ucycom_softc *sc);
+Static void ucycom_cleanup(struct ucycom_softc *);
#ifdef UCYCOM_DEBUG
Static void ucycom_get_cfg(struct ucycom_softc *);
Index: src/sys/dev/usb/udsbr.c
diff -u src/sys/dev/usb/udsbr.c:1.22.14.3 src/sys/dev/usb/udsbr.c:1.22.14.4
--- src/sys/dev/usb/udsbr.c:1.22.14.3 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/udsbr.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: udsbr.c,v 1.22.14.3 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: udsbr.c,v 1.22.14.4 2014/12/06 08:27:23 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.3 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.22.14.4 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,12 +90,12 @@ struct udsbr_softc {
char sc_dying;
};
-Static int udsbr_req(struct udsbr_softc *sc, int ureq, int value,
- int index);
-Static void udsbr_start(struct udsbr_softc *sc);
-Static void udsbr_stop(struct udsbr_softc *sc);
-Static void udsbr_setfreq(struct udsbr_softc *sc, int freq);
-Static int udsbr_status(struct udsbr_softc *sc);
+Static int udsbr_req(struct udsbr_softc *, int, int,
+ int);
+Static void udsbr_start(struct udsbr_softc *);
+Static void udsbr_stop(struct udsbr_softc *);
+Static void udsbr_setfreq(struct udsbr_softc *, int);
+Static int udsbr_status(struct udsbr_softc *);
int udsbr_match(device_t, cfdata_t, void *);
void udsbr_attach(device_t, device_t, void *);
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.59.6.3 src/sys/dev/usb/uftdi.c:1.59.6.4
--- src/sys/dev/usb/uftdi.c:1.59.6.3 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/uftdi.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.59.6.3 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: uftdi.c,v 1.59.6.4 2014/12/06 08:27:23 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.3 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.59.6.4 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,14 +97,14 @@ struct uftdi_softc {
};
-Static void uftdi_get_status(void *, int portno, u_char *lsr, u_char *msr);
+Static void uftdi_get_status(void *, int, u_char *, u_char *);
Static void uftdi_set(void *, int, int, int);
Static int uftdi_param(void *, int, struct termios *);
-Static int uftdi_open(void *sc, int portno);
-Static void uftdi_read(void *sc, int portno, u_char **ptr,uint32_t *count);
-Static void uftdi_write(void *sc, int portno, u_char *to, u_char *from,
- uint32_t *count);
-Static void uftdi_break(void *sc, int portno, int onoff);
+Static int uftdi_open(void *, int);
+Static void uftdi_read(void *, int, u_char **, uint32_t *);
+Static void uftdi_write(void *, int, u_char *, u_char *,
+ uint32_t *);
+Static void uftdi_break(void *, int, int);
struct ucom_methods uftdi_methods = {
uftdi_get_status,
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.126.2.5 src/sys/dev/usb/ugen.c:1.126.2.6
--- src/sys/dev/usb/ugen.c:1.126.2.5 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/ugen.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.126.2.5 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: ugen.c,v 1.126.2.6 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.126.2.5 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.126.2.6 2014/12/06 08:27:23 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -158,23 +158,23 @@ const struct cdevsw ugen_cdevsw = {
.d_flag = D_OTHER,
};
-Static void ugenintr(usbd_xfer_handle xfer, usbd_private_handle addr,
- usbd_status status);
-Static void ugen_isoc_rintr(usbd_xfer_handle xfer, usbd_private_handle addr,
- usbd_status status);
-Static void ugen_bulkra_intr(usbd_xfer_handle xfer, usbd_private_handle addr,
- usbd_status status);
-Static void ugen_bulkwb_intr(usbd_xfer_handle xfer, usbd_private_handle addr,
- usbd_status status);
+Static void ugenintr(usbd_xfer_handle, usbd_private_handle,
+ usbd_status);
+Static void ugen_isoc_rintr(usbd_xfer_handle, usbd_private_handle,
+ usbd_status);
+Static void ugen_bulkra_intr(usbd_xfer_handle, usbd_private_handle,
+ usbd_status);
+Static void ugen_bulkwb_intr(usbd_xfer_handle, usbd_private_handle,
+ usbd_status);
Static int ugen_do_read(struct ugen_softc *, int, struct uio *, int);
Static int ugen_do_write(struct ugen_softc *, int, struct uio *, int);
Static int ugen_do_ioctl(struct ugen_softc *, int, u_long,
void *, int, struct lwp *);
-Static int ugen_set_config(struct ugen_softc *sc, int configno);
-Static usb_config_descriptor_t *ugen_get_cdesc(struct ugen_softc *sc,
- int index, int *lenp);
+Static int ugen_set_config(struct ugen_softc *, int);
+Static usb_config_descriptor_t *ugen_get_cdesc(struct ugen_softc *,
+ int, int *);
Static usbd_status ugen_set_interface(struct ugen_softc *, int, int);
-Static int ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx);
+Static int ugen_get_alt_index(struct ugen_softc *, int);
#define UGENUNIT(n) ((minor(n) >> 4) & 0xf)
#define UGENENDPOINT(n) (minor(n) & 0xf)
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.264.4.14 src/sys/dev/usb/uhci.c:1.264.4.15
--- src/sys/dev/usb/uhci.c:1.264.4.14 Fri Dec 5 13:23:38 2014
+++ src/sys/dev/usb/uhci.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.264.4.14 2014/12/05 13:23:38 skrll Exp $ */
+/* $NetBSD: uhci.c,v 1.264.4.15 2014/12/06 08:27:23 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.14 2014/12/05 13:23:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.15 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,7 +128,7 @@ struct uhci_pipe {
Static void uhci_globalreset(uhci_softc_t *);
Static usbd_status uhci_portreset(uhci_softc_t*, int);
Static void uhci_reset(uhci_softc_t *);
-Static usbd_status uhci_run(uhci_softc_t *, int run, int locked);
+Static usbd_status uhci_run(uhci_softc_t *, int, int);
Static uhci_soft_td_t *uhci_alloc_std(uhci_softc_t *);
Static void uhci_free_std(uhci_softc_t *, uhci_soft_td_t *);
Static uhci_soft_qh_t *uhci_alloc_sqh(uhci_softc_t *);
@@ -149,7 +149,7 @@ Static void uhci_waitintr(uhci_softc_t
Static void uhci_check_intr(uhci_softc_t *, uhci_intr_info_t *);
Static void uhci_idone(uhci_intr_info_t *);
-Static void uhci_abort_xfer(usbd_xfer_handle, usbd_status status);
+Static void uhci_abort_xfer(usbd_xfer_handle, usbd_status);
Static void uhci_timeout(void *);
Static void uhci_timeout_task(void *);
@@ -159,10 +159,10 @@ Static void uhci_add_bulk(uhci_softc_t
Static void uhci_remove_ls_ctrl(uhci_softc_t *,uhci_soft_qh_t *);
Static void uhci_remove_hs_ctrl(uhci_softc_t *,uhci_soft_qh_t *);
Static void uhci_remove_bulk(uhci_softc_t *,uhci_soft_qh_t *);
-Static void uhci_add_loop(uhci_softc_t *sc);
-Static void uhci_rem_loop(uhci_softc_t *sc);
+Static void uhci_add_loop(uhci_softc_t *);
+Static void uhci_rem_loop(uhci_softc_t *);
-Static usbd_status uhci_setup_isoc(usbd_pipe_handle pipe);
+Static usbd_status uhci_setup_isoc(usbd_pipe_handle);
Static void uhci_device_isoc_enter(usbd_xfer_handle);
Static usbd_xfer_handle uhci_allocx(struct usbd_bus *);
@@ -205,15 +205,15 @@ Static usbd_status uhci_open(usbd_pipe_h
Static void uhci_poll(struct usbd_bus *);
Static void uhci_softintr(void *);
-Static usbd_status uhci_device_request(usbd_xfer_handle xfer);
+Static usbd_status uhci_device_request(usbd_xfer_handle);
Static void uhci_add_intr(uhci_softc_t *, uhci_soft_qh_t *);
Static void uhci_remove_intr(uhci_softc_t *, uhci_soft_qh_t *);
-Static usbd_status uhci_device_setintr(uhci_softc_t *sc,
- struct uhci_pipe *pipe, int ival);
+Static usbd_status uhci_device_setintr(uhci_softc_t *,
+ struct uhci_pipe *, int);
-Static void uhci_device_clear_toggle(usbd_pipe_handle pipe);
-Static void uhci_noop(usbd_pipe_handle pipe);
+Static void uhci_device_clear_toggle(usbd_pipe_handle);
+Static void uhci_noop(usbd_pipe_handle);
static inline uhci_soft_qh_t *uhci_find_prev_qh(uhci_soft_qh_t *,
uhci_soft_qh_t *);
@@ -225,7 +225,7 @@ Static void uhci_dump_qhs(uhci_soft_qh_
Static void uhci_dump_qh(uhci_soft_qh_t *);
Static void uhci_dump_tds(uhci_soft_td_t *);
Static void uhci_dump_td(uhci_soft_td_t *);
-Static void uhci_dump_ii(uhci_intr_info_t *ii);
+Static void uhci_dump_ii(uhci_intr_info_t *);
void uhci_dump(void);
#endif
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.92.4.4 src/sys/dev/usb/uhid.c:1.92.4.5
--- src/sys/dev/usb/uhid.c:1.92.4.4 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/uhid.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.92.4.4 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: uhid.c,v 1.92.4.5 2014/12/06 08:27:23 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.4 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.92.4.5 2014/12/06 08:27:23 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -130,11 +130,11 @@ const struct cdevsw uhid_cdevsw = {
.d_flag = D_OTHER | D_MPSAFE
};
-Static void uhid_intr(struct uhidev *, void *, u_int len);
+Static void uhid_intr(struct uhidev *, void *, u_int);
Static void uhid_softintr(void *);
-Static int uhid_do_read(struct uhid_softc *, struct uio *uio, int);
-Static int uhid_do_write(struct uhid_softc *, struct uio *uio, int);
+Static int uhid_do_read(struct uhid_softc *, struct uio *, int);
+Static int uhid_do_write(struct uhid_softc *, struct uio *, int);
Static int uhid_do_ioctl(struct uhid_softc*, u_long, void *, int, struct lwp *);
int uhid_match(device_t, cfdata_t, void *);
Index: src/sys/dev/usb/uhub.c
diff -u src/sys/dev/usb/uhub.c:1.126.2.4 src/sys/dev/usb/uhub.c:1.126.2.5
--- src/sys/dev/usb/uhub.c:1.126.2.4 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/uhub.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.126.2.4 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: uhub.c,v 1.126.2.5 2014/12/06 08:27:23 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.126.2.4 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.126.2.5 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,8 +83,8 @@ struct uhub_softc {
#define PORTSTAT_ISSET(sc, port) \
((sc)->sc_status[(port) / 8] & (1 << ((port) % 8)))
-Static usbd_status uhub_explore(usbd_device_handle hub);
-Static void uhub_intr(usbd_xfer_handle, usbd_private_handle,usbd_status);
+Static usbd_status uhub_explore(usbd_device_handle);
+Static void uhub_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
/*
Index: src/sys/dev/usb/uipaq.c
diff -u src/sys/dev/usb/uipaq.c:1.19.14.2 src/sys/dev/usb/uipaq.c:1.19.14.3
--- src/sys/dev/usb/uipaq.c:1.19.14.2 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/uipaq.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipaq.c,v 1.19.14.2 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: uipaq.c,v 1.19.14.3 2014/12/06 08:27:23 skrll Exp $ */
/* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.19.14.2 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.19.14.3 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,9 +95,9 @@ Static void uipaq_set(void *, int, int,
/* Support routines. */
/* based on uppc module by Sam Lawrance */
-Static void uipaq_dtr(struct uipaq_softc *sc, int onoff);
-Static void uipaq_rts(struct uipaq_softc *sc, int onoff);
-Static void uipaq_break(struct uipaq_softc* sc, int onoff);
+Static void uipaq_dtr(struct uipaq_softc *, int);
+Static void uipaq_rts(struct uipaq_softc *, int);
+Static void uipaq_break(struct uipaq_softc *, int);
struct ucom_methods uipaq_methods = {
Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.38.6.4 src/sys/dev/usb/uirda.c:1.38.6.5
--- src/sys/dev/usb/uirda.c:1.38.6.4 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/uirda.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.38.6.4 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: uirda.c,v 1.38.6.5 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.38.6.4 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.38.6.5 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -107,15 +107,15 @@ static struct {
-int uirda_open(void *h, int flag, int mode, struct lwp *l);
-int uirda_close(void *h, int flag, int mode, struct lwp *l);
-int uirda_read(void *h, struct uio *uio, int flag);
-int uirda_write(void *h, struct uio *uio, int flag);
-int uirda_set_params(void *h, struct irda_params *params);
-int uirda_get_speeds(void *h, int *speeds);
-int uirda_get_turnarounds(void *h, int *times);
-int uirda_poll(void *h, int events, struct lwp *l);
-int uirda_kqfilter(void *h, struct knote *kn);
+int uirda_open(void *, int, int, struct lwp *);
+int uirda_close(void *, int, int, struct lwp *);
+int uirda_read(void *, struct uio *, int);
+int uirda_write(void *, struct uio *, int);
+int uirda_set_params(void *, struct irda_params *);
+int uirda_get_speeds(void *, int *);
+int uirda_get_turnarounds(void *, int *);
+int uirda_poll(void *, int, struct lwp *);
+int uirda_kqfilter(void *, struct knote *);
struct irframe_methods uirda_methods = {
uirda_open, uirda_close, uirda_read, uirda_write, uirda_poll,
Index: src/sys/dev/usb/uirdavar.h
diff -u src/sys/dev/usb/uirdavar.h:1.5.38.1 src/sys/dev/usb/uirdavar.h:1.5.38.2
--- src/sys/dev/usb/uirdavar.h:1.5.38.1 Sun Nov 30 12:18:58 2014
+++ src/sys/dev/usb/uirdavar.h Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uirdavar.h,v 1.5.38.1 2014/11/30 12:18:58 skrll Exp $ */
+/* $NetBSD: uirdavar.h,v 1.5.38.2 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 2001,2007 The NetBSD Foundation, Inc.
@@ -150,15 +150,14 @@ struct uirda_softc {
struct irframe_methods *sc_irm;
};
-usbd_status usbd_get_class_desc(usbd_device_handle, int type, int index,
- int len, void *desc);
+usbd_status usbd_get_class_desc(usbd_device_handle, int, int, int, void *);
-int uirda_open(void *h, int flag, int mode, struct lwp *l);
-int uirda_close(void *h, int flag, int mode, struct lwp *l);
-int uirda_read(void *h, struct uio *uio, int flag);
-int uirda_write(void *h, struct uio *uio, int flag);
-int uirda_set_params(void *h, struct irda_params *params);
-int uirda_get_speeds(void *h, int *speeds);
-int uirda_get_turnarounds(void *h, int *times);
-int uirda_poll(void *h, int events, struct lwp *l);
-int uirda_kqfilter(void *h, struct knote *kn);
+int uirda_open(void *, int, int, struct lwp *);
+int uirda_close(void *, int, int, struct lwp *);
+int uirda_read(void *, struct uio *, int);
+int uirda_write(void *, struct uio *, int);
+int uirda_set_params(void *, struct irda_params *);
+int uirda_get_speeds(void *, int *);
+int uirda_get_turnarounds(void *, int *);
+int uirda_poll(void *, int, struct lwp *);
+int uirda_kqfilter(void *, struct knote *);
Index: src/sys/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.129.6.2 src/sys/dev/usb/ukbd.c:1.129.6.3
--- src/sys/dev/usb/ukbd.c:1.129.6.2 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/ukbd.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.129.6.2 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: ukbd.c,v 1.129.6.3 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.129.6.2 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.129.6.3 2014/12/06 08:27:23 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_ukbd.h"
@@ -334,11 +334,11 @@ const struct wskbd_consops ukbd_consops
.bell = NULL,
};
-Static const char *ukbd_parse_desc(struct ukbd_softc *sc);
+Static const char *ukbd_parse_desc(struct ukbd_softc *);
-Static void ukbd_intr(struct uhidev *addr, void *ibuf, u_int len);
-Static void ukbd_decode(struct ukbd_softc *sc, struct ukbd_data *ud);
-Static void ukbd_delayed_decode(void *addr);
+Static void ukbd_intr(struct uhidev *, void *, u_int);
+Static void ukbd_decode(struct ukbd_softc *, struct ukbd_data *);
+Static void ukbd_delayed_decode(void *);
Static int ukbd_enable(void *, int);
Static void ukbd_set_leds(void *, int);
Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.95.4.4 src/sys/dev/usb/ulpt.c:1.95.4.5
--- src/sys/dev/usb/ulpt.c:1.95.4.4 Fri Dec 5 09:37:49 2014
+++ src/sys/dev/usb/ulpt.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.95.4.4 2014/12/05 09:37:49 skrll Exp $ */
+/* $NetBSD: ulpt.c,v 1.95.4.5 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.95.4.4 2014/12/05 09:37:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.95.4.5 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -146,13 +146,13 @@ const struct cdevsw ulpt_cdevsw = {
void ulpt_disco(void *);
-int ulpt_do_write(struct ulpt_softc *, struct uio *uio, int);
-int ulpt_do_read(struct ulpt_softc *, struct uio *uio, int);
+int ulpt_do_write(struct ulpt_softc *, struct uio *, int);
+int ulpt_do_read(struct ulpt_softc *, struct uio *, int);
int ulpt_status(struct ulpt_softc *);
void ulpt_reset(struct ulpt_softc *);
int ulpt_statusmsg(u_char, struct ulpt_softc *);
-void ulpt_read_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
- usbd_status status);
+void ulpt_read_cb(usbd_xfer_handle, usbd_private_handle,
+ usbd_status);
void ulpt_tick(void *xsc);
#if 0
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.149.2.3 src/sys/dev/usb/umass.c:1.149.2.4
--- src/sys/dev/usb/umass.c:1.149.2.3 Fri Dec 5 09:37:50 2014
+++ src/sys/dev/usb/umass.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.149.2.3 2014/12/05 09:37:50 skrll Exp $ */
+/* $NetBSD: umass.c,v 1.149.2.4 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.149.2.3 2014/12/05 09:37:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.149.2.4 2014/12/06 08:27:23 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -224,18 +224,18 @@ CFATTACH_DECL2_NEW(umass, sizeof(struct
Static void umass_disco(struct umass_softc *sc);
/* generic transfer functions */
-Static usbd_status umass_setup_transfer(struct umass_softc *sc,
- usbd_pipe_handle pipe,
- void *buffer, int buflen, int flags,
- usbd_xfer_handle xfer);
-Static usbd_status umass_setup_ctrl_transfer(struct umass_softc *sc,
- usb_device_request_t *req,
- void *buffer, int buflen, int flags,
- usbd_xfer_handle xfer);
-Static void umass_clear_endpoint_stall(struct umass_softc *sc, int endpt,
- usbd_xfer_handle xfer);
+Static usbd_status umass_setup_transfer(struct umass_softc *,
+ usbd_pipe_handle,
+ void *, int, int,
+ usbd_xfer_handle);
+Static usbd_status umass_setup_ctrl_transfer(struct umass_softc *,
+ usb_device_request_t *,
+ void *, int, int,
+ usbd_xfer_handle);
+Static void umass_clear_endpoint_stall(struct umass_softc *, int,
+ usbd_xfer_handle);
#if 0
-Static void umass_reset(struct umass_softc *sc, transfer_cb_f cb, void *priv);
+Static void umass_reset(struct umass_softc *, transfer_cb_f, void *);
#endif
/* Bulk-Only related functions */
Index: src/sys/dev/usb/umass_isdata.h
diff -u src/sys/dev/usb/umass_isdata.h:1.2 src/sys/dev/usb/umass_isdata.h:1.2.66.1
--- src/sys/dev/usb/umass_isdata.h:1.2 Mon Apr 28 20:24:00 2008
+++ src/sys/dev/usb/umass_isdata.h Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_isdata.h,v 1.2 2008/04/28 20:24:00 martin Exp $ */
+/* $NetBSD: umass_isdata.h,v 1.2.66.1 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,4 +30,4 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-int umass_isdata_attach(struct umass_softc *sc);
+int umass_isdata_attach(struct umass_softc *);
Index: src/sys/dev/usb/umass_scsipi.h
diff -u src/sys/dev/usb/umass_scsipi.h:1.2 src/sys/dev/usb/umass_scsipi.h:1.2.66.1
--- src/sys/dev/usb/umass_scsipi.h:1.2 Mon Apr 28 20:24:00 2008
+++ src/sys/dev/usb/umass_scsipi.h Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.h,v 1.2 2008/04/28 20:24:00 martin Exp $ */
+/* $NetBSD: umass_scsipi.h,v 1.2.66.1 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,5 +30,5 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-int umass_scsi_attach(struct umass_softc *sc);
-int umass_atapi_attach(struct umass_softc *sc);
+int umass_scsi_attach(struct umass_softc *);
+int umass_atapi_attach(struct umass_softc *);
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.49 src/sys/dev/usb/umass_scsipi.c:1.49.2.1
--- src/sys/dev/usb/umass_scsipi.c:1.49 Fri Sep 12 16:40:38 2014
+++ src/sys/dev/usb/umass_scsipi.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.49 2014/09/12 16:40:38 skrll Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.49.2.1 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.49 2014/09/12 16:40:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.49.2.1 2014/12/06 08:27:23 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -93,18 +93,18 @@ struct umass_scsipi_softc {
Static void umass_scsipi_request(struct scsipi_channel *,
scsipi_adapter_req_t, void *);
-Static void umass_scsipi_minphys(struct buf *bp);
+Static void umass_scsipi_minphys(struct buf *);
Static int umass_scsipi_ioctl(struct scsipi_channel *, u_long,
void *, int, proc_t *);
-Static int umass_scsipi_getgeom(struct scsipi_periph *periph,
- struct disk_parms *, u_long sectors);
+Static int umass_scsipi_getgeom(struct scsipi_periph *,
+ struct disk_parms *, u_long);
-Static void umass_scsipi_cb(struct umass_softc *sc, void *priv,
- int residue, int status);
-Static void umass_scsipi_sense_cb(struct umass_softc *sc, void *priv,
- int residue, int status);
+Static void umass_scsipi_cb(struct umass_softc *, void *,
+ int, int);
+Static void umass_scsipi_sense_cb(struct umass_softc *, void *,
+ int, int);
-Static struct umass_scsipi_softc *umass_scsipi_setup(struct umass_softc *sc);
+Static struct umass_scsipi_softc *umass_scsipi_setup(struct umass_softc *);
#if NATAPIBUS > 0
Static void umass_atapi_probe_device(struct atapibus_softc *, int);
Index: src/sys/dev/usb/umcs.c
diff -u src/sys/dev/usb/umcs.c:1.8 src/sys/dev/usb/umcs.c:1.8.2.1
--- src/sys/dev/usb/umcs.c:1.8 Sat Aug 23 21:37:56 2014
+++ src/sys/dev/usb/umcs.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umcs.c,v 1.8 2014/08/23 21:37:56 martin Exp $ */
+/* $NetBSD: umcs.c,v 1.8.2.1 2014/12/06 08:27:23 skrll Exp $ */
/* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */
/*-
@@ -41,7 +41,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.8 2014/08/23 21:37:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.8.2.1 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,28 +99,28 @@ struct umcs7840_softc {
bool sc_dying; /* we have been deactivated */
};
-static int umcs7840_get_reg(struct umcs7840_softc *sc, uint8_t reg, uint8_t *data);
-static int umcs7840_set_reg(struct umcs7840_softc *sc, uint8_t reg, uint8_t data);
-static int umcs7840_get_UART_reg(struct umcs7840_softc *sc, uint8_t portno, uint8_t reg, uint8_t *data);
-static int umcs7840_set_UART_reg(struct umcs7840_softc *sc, uint8_t portno, uint8_t reg, uint8_t data);
-static int umcs7840_calc_baudrate(uint32_t rate, uint16_t *divisor, uint8_t *clk);
-static void umcs7840_dtr(struct umcs7840_softc *sc, int portno, bool onoff);
-static void umcs7840_rts(struct umcs7840_softc *sc, int portno, bool onoff);
-static void umcs7840_break(struct umcs7840_softc *sc, int portno, bool onoff);
+static int umcs7840_get_reg(struct umcs7840_softc *, uint8_t, uint8_t *);
+static int umcs7840_set_reg(struct umcs7840_softc *, uint8_t, uint8_t);
+static int umcs7840_get_UART_reg(struct umcs7840_softc *, uint8_t, uint8_t, uint8_t *);
+static int umcs7840_set_UART_reg(struct umcs7840_softc *, uint8_t, uint8_t, uint8_t );
+static int umcs7840_calc_baudrate(uint32_t, uint16_t *, uint8_t *);
+static void umcs7840_dtr(struct umcs7840_softc *, int, bool);
+static void umcs7840_rts(struct umcs7840_softc *, int, bool);
+static void umcs7840_break(struct umcs7840_softc *, int, bool );
static int umcs7840_match(device_t, cfdata_t, void *);
static void umcs7840_attach(device_t, device_t, void *);
static int umcs7840_detach(device_t, int);
-static void umcs7840_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status);
+static void umcs7840_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
static void umcs7840_change_task(void *arg);
-static int umcs7840_activate(device_t, enum devact);
+static int umcs7840_activate(device_t, enum devact);
static void umcs7840_childdet(device_t, device_t);
static void umcs7840_get_status(void *, int, u_char *, u_char *);
static void umcs7840_set(void *, int, int, int);
static int umcs7840_param(void *, int, struct termios *);
-static int umcs7840_port_open(void *sc, int portno);
-static void umcs7840_port_close(void *sc, int portno);
+static int umcs7840_port_open(void *, int);
+static void umcs7840_port_close(void *, int);
struct ucom_methods umcs7840_methods = {
.ucom_get_status = umcs7840_get_status,
@@ -495,7 +495,7 @@ umcs7840_calc_baudrate(uint32_t rate, ui
return (0);
}
-static int
+static int
umcs7840_detach(device_t self, int flags)
{
struct umcs7840_softc *sc = device_private(self);
Index: src/sys/dev/usb/umct.c
diff -u src/sys/dev/usb/umct.c:1.32.24.5 src/sys/dev/usb/umct.c:1.32.24.6
--- src/sys/dev/usb/umct.c:1.32.24.5 Fri Dec 5 09:37:50 2014
+++ src/sys/dev/usb/umct.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umct.c,v 1.32.24.5 2014/12/05 09:37:50 skrll Exp $ */
+/* $NetBSD: umct.c,v 1.32.24.6 2014/12/06 08:27:23 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.5 2014/12/05 09:37:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.32.24.6 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,7 +118,7 @@ Static void umct_dtr(struct umct_softc *
Static void umct_rts(struct umct_softc *, int);
Static void umct_break(struct umct_softc *, int);
Static void umct_set_line_state(struct umct_softc *);
-Static void umct_get_status(void *, int portno, u_char *lsr, u_char *msr);
+Static void umct_get_status(void *, int, u_char *, u_char *);
Static int umct_param(void *, int, struct termios *);
Static int umct_open(void *, int);
Static void umct_close(void *, int);
Index: src/sys/dev/usb/umodem_common.c
diff -u src/sys/dev/usb/umodem_common.c:1.22.38.2 src/sys/dev/usb/umodem_common.c:1.22.38.3
--- src/sys/dev/usb/umodem_common.c:1.22.38.2 Fri Dec 5 09:37:50 2014
+++ src/sys/dev/usb/umodem_common.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem_common.c,v 1.22.38.2 2014/12/05 09:37:50 skrll Exp $ */
+/* $NetBSD: umodem_common.c,v 1.22.38.3 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.22.38.2 2014/12/05 09:37:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.22.38.3 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,10 +90,10 @@ int umodemdebug = 0;
#define UMODEMIBUFSIZE 4096
#define UMODEMOBUFSIZE 4096
-Static usbd_status umodem_set_comm_feature(struct umodem_softc *sc,
- int feature, int state);
-Static usbd_status umodem_set_line_coding(struct umodem_softc *sc,
- usb_cdc_line_state_t *state);
+Static usbd_status umodem_set_comm_feature(struct umodem_softc *,
+ int, int);
+Static usbd_status umodem_set_line_coding(struct umodem_softc *,
+ usb_cdc_line_state_t *);
Static void umodem_dtr(struct umodem_softc *, int);
Static void umodem_rts(struct umodem_softc *, int);
Index: src/sys/dev/usb/umodemvar.h
diff -u src/sys/dev/usb/umodemvar.h:1.8 src/sys/dev/usb/umodemvar.h:1.8.38.1
--- src/sys/dev/usb/umodemvar.h:1.8 Wed Nov 3 22:34:24 2010
+++ src/sys/dev/usb/umodemvar.h Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: umodemvar.h,v 1.8 2010/11/03 22:34:24 dyoung Exp $ */
+/* $NetBSD: umodemvar.h,v 1.8.38.1 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -68,11 +68,11 @@ int umodem_common_attach(device_t, struc
int umodem_get_caps(usbd_device_handle, int *, int *,
usb_interface_descriptor_t *);
-void umodem_get_status(void *, int portno, u_char *lsr, u_char *msr);
+void umodem_get_status(void *, int, u_char *, u_char *);
void umodem_set(void *, int, int, int);
int umodem_param(void *, int, struct termios *);
int umodem_ioctl(void *, int, u_long, void *, int, proc_t *);
-int umodem_open(void *, int portno);
-void umodem_close(void *, int portno);
+int umodem_open(void *, int);
+void umodem_close(void *, int);
int umodem_common_activate(struct umodem_softc *, enum devact);
int umodem_common_detach(struct umodem_softc *, int);
Index: src/sys/dev/usb/ums.c
diff -u src/sys/dev/usb/ums.c:1.87.6.4 src/sys/dev/usb/ums.c:1.87.6.5
--- src/sys/dev/usb/ums.c:1.87.6.4 Fri Dec 5 09:37:50 2014
+++ src/sys/dev/usb/ums.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.87.6.4 2014/12/05 09:37:50 skrll Exp $ */
+/* $NetBSD: ums.c,v 1.87.6.5 2014/12/06 08:27:23 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.4 2014/12/05 09:37:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.87.6.5 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,11 +120,11 @@ static const struct {
#define MOUSE_FLAGS_MASK (HIO_CONST|HIO_RELATIVE)
-Static void ums_intr(struct uhidev *addr, void *ibuf, u_int len);
+Static void ums_intr(struct uhidev *, void *, u_int);
Static int ums_enable(void *);
Static void ums_disable(void *);
-Static int ums_ioctl(void *, u_long, void *, int, struct lwp * );
+Static int ums_ioctl(void *, u_long, void *, int, struct lwp *);
const struct wsmouse_accessops ums_accessops = {
ums_enable,
Index: src/sys/dev/usb/uplcom.c
diff -u src/sys/dev/usb/uplcom.c:1.74.4.4 src/sys/dev/usb/uplcom.c:1.74.4.5
--- src/sys/dev/usb/uplcom.c:1.74.4.4 Fri Dec 5 09:37:50 2014
+++ src/sys/dev/usb/uplcom.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.74.4.4 2014/12/05 09:37:50 skrll Exp $ */
+/* $NetBSD: uplcom.c,v 1.74.4.5 2014/12/06 08:27:23 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.4 2014/12/05 09:37:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.74.4.5 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -116,8 +116,8 @@ struct uplcom_softc {
#define UPLCOMOBUFSIZE 256
Static usbd_status uplcom_reset(struct uplcom_softc *);
-Static usbd_status uplcom_set_line_coding(struct uplcom_softc *sc,
- usb_cdc_line_state_t *state);
+Static usbd_status uplcom_set_line_coding(struct uplcom_softc *,
+ usb_cdc_line_state_t *);
Static usbd_status uplcom_set_crtscts(struct uplcom_softc *);
Static void uplcom_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
@@ -126,7 +126,7 @@ Static void uplcom_dtr(struct uplcom_sof
Static void uplcom_rts(struct uplcom_softc *, int);
Static void uplcom_break(struct uplcom_softc *, int);
Static void uplcom_set_line_state(struct uplcom_softc *);
-Static void uplcom_get_status(void *, int portno, u_char *lsr, u_char *msr);
+Static void uplcom_get_status(void *, int, u_char *, u_char *);
#if TODO
Static int uplcom_ioctl(void *, int, u_long, void *, int, proc_t *);
#endif
Index: src/sys/dev/usb/usb_mem.h
diff -u src/sys/dev/usb/usb_mem.h:1.30.14.4 src/sys/dev/usb/usb_mem.h:1.30.14.5
--- src/sys/dev/usb/usb_mem.h:1.30.14.4 Wed Dec 3 12:52:07 2014
+++ src/sys/dev/usb/usb_mem.h Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.h,v 1.30.14.4 2014/12/03 12:52:07 skrll Exp $ */
+/* $NetBSD: usb_mem.h,v 1.30.14.5 2014/12/06 08:27:23 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.9 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -51,7 +51,7 @@ usbd_status usb_allocmem(usbd_bus_handle
usbd_status usb_allocmem_flags(usbd_bus_handle, size_t, size_t, usb_dma_t *,
int);
void usb_freemem(usbd_bus_handle, usb_dma_t *);
-void usb_syncmem(usb_dma_t *, bus_addr_t, bus_size_t, int ops);
+void usb_syncmem(usb_dma_t *, bus_addr_t, bus_size_t, int);
bus_addr_t usb_dmaaddr(usb_dma_t *, unsigned int);
Index: src/sys/dev/usb/usbdi_util.h
diff -u src/sys/dev/usb/usbdi_util.h:1.45.6.3 src/sys/dev/usb/usbdi_util.h:1.45.6.4
--- src/sys/dev/usb/usbdi_util.h:1.45.6.3 Wed Dec 3 14:18:07 2014
+++ src/sys/dev/usb/usbdi_util.h Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.h,v 1.45.6.3 2014/12/03 14:18:07 skrll Exp $ */
+/* $NetBSD: usbdi_util.h,v 1.45.6.4 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -35,38 +35,38 @@
#include <dev/usb/usbhid.h>
-usbd_status usbd_get_desc(usbd_device_handle dev, int type,
- int index, int len, void *desc);
+usbd_status usbd_get_desc(usbd_device_handle, int,
+ int, int, void *);
usbd_status usbd_get_config_desc(usbd_device_handle, int,
usb_config_descriptor_t *);
usbd_status usbd_get_config_desc_full(usbd_device_handle, int, void *, int);
-usbd_status usbd_get_device_desc(usbd_device_handle dev,
- usb_device_descriptor_t *d);
-usbd_status usbd_set_address(usbd_device_handle dev, int addr);
+usbd_status usbd_get_device_desc(usbd_device_handle,
+ usb_device_descriptor_t *);
+usbd_status usbd_set_address(usbd_device_handle, int);
usbd_status usbd_get_port_status(usbd_device_handle,
int, usb_port_status_t *);
-usbd_status usbd_set_hub_feature(usbd_device_handle dev, int);
+usbd_status usbd_set_hub_feature(usbd_device_handle, int);
usbd_status usbd_clear_hub_feature(usbd_device_handle, int);
-usbd_status usbd_set_port_feature(usbd_device_handle dev, int, int);
+usbd_status usbd_set_port_feature(usbd_device_handle, int, int);
usbd_status usbd_clear_port_feature(usbd_device_handle, int, int);
usbd_status usbd_get_device_status(usbd_device_handle, usb_status_t *);
usbd_status usbd_get_hub_status(usbd_device_handle, usb_hub_status_t *);
-usbd_status usbd_get_protocol(usbd_interface_handle dev, uint8_t *report);
-usbd_status usbd_set_protocol(usbd_interface_handle dev, int report);
-usbd_status usbd_get_report_descriptor(usbd_device_handle dev, int ifcno,
- int size, void *d);
-usb_hid_descriptor_t *usbd_get_hid_descriptor(usbd_interface_handle ifc);
-usbd_status usbd_set_report(usbd_interface_handle iface, int type, int id,
- void *data,int len);
-usbd_status usbd_get_report(usbd_interface_handle iface, int type, int id,
- void *data, int len);
-usbd_status usbd_set_idle(usbd_interface_handle iface, int duration,int id);
-usbd_status usbd_read_report_desc(usbd_interface_handle ifc, void **descp,
- int *sizep);
-usbd_status usbd_get_config(usbd_device_handle dev, uint8_t *conf);
-usbd_status usbd_get_string_desc(usbd_device_handle dev, int sindex,
- int langid,usb_string_descriptor_t *sdesc,
- int *sizep);
+usbd_status usbd_get_protocol(usbd_interface_handle, uint8_t *);
+usbd_status usbd_set_protocol(usbd_interface_handle, int);
+usbd_status usbd_get_report_descriptor(usbd_device_handle, int,
+ int, void *);
+usb_hid_descriptor_t *usbd_get_hid_descriptor(usbd_interface_handle);
+usbd_status usbd_set_report(usbd_interface_handle, int, int,
+ void *, int);
+usbd_status usbd_get_report(usbd_interface_handle, int, int,
+ void *, int);
+usbd_status usbd_set_idle(usbd_interface_handle, int, int);
+usbd_status usbd_read_report_desc(usbd_interface_handle, void **,
+ int *);
+usbd_status usbd_get_config(usbd_device_handle, uint8_t *);
+usbd_status usbd_get_string_desc(usbd_device_handle, int,
+ int, usb_string_descriptor_t *,
+ int *);
usbd_status usbd_set_config_no(usbd_device_handle, int, int);
@@ -96,11 +96,11 @@ typedef struct {
uByte bDescriptorSubtype;
} UPACKED usb_cdc_descriptor_t;
-const usb_cdc_descriptor_t *usb_find_desc(usbd_device_handle dev, int type,
- int subtype);
-const usb_cdc_descriptor_t *usb_find_desc_if(usbd_device_handle dev, int type,
- int subtype,
- usb_interface_descriptor_t *id);
+const usb_cdc_descriptor_t *usb_find_desc(usbd_device_handle, int,
+ int);
+const usb_cdc_descriptor_t *usb_find_desc_if(usbd_device_handle, int,
+ int,
+ usb_interface_descriptor_t *);
#define USBD_CDCSUBTYPE_ANY (~0)
#endif /* _USBDI_UTIL_H_ */
Index: src/sys/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.109.2.7 src/sys/dev/usb/usbdivar.h:1.109.2.8
--- src/sys/dev/usb/usbdivar.h:1.109.2.7 Thu Dec 4 08:04:31 2014
+++ src/sys/dev/usb/usbdivar.h Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.109.2.7 2014/12/04 08:04:31 skrll Exp $ */
+/* $NetBSD: usbdivar.h,v 1.109.2.8 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@ struct usbd_endpoint {
};
struct usbd_bus_methods {
- usbd_status (*ubm_open)(struct usbd_pipe *pipe);
+ usbd_status (*ubm_open)(struct usbd_pipe *);
void (*ubm_softint)(void *);
void (*ubm_dopoll)(struct usbd_bus *);
struct usbd_xfer * (*ubm_allocx)(struct usbd_bus *);
@@ -281,11 +281,11 @@ void usbd_init(void);
void usbd_finish(void);
#if defined(USB_DEBUG) || defined(EHCI_DEBUG) || defined(OHCI_DEBUG)
-void usbd_dump_iface(struct usbd_interface *iface);
-void usbd_dump_device(struct usbd_device *dev);
-void usbd_dump_endpoint(struct usbd_endpoint *endp);
-void usbd_dump_queue(usbd_pipe_handle pipe);
-void usbd_dump_pipe(usbd_pipe_handle pipe);
+void usbd_dump_iface(struct usbd_interface *);
+void usbd_dump_device(struct usbd_device *);
+void usbd_dump_endpoint(struct usbd_endpoint *);
+void usbd_dump_queue(usbd_pipe_handle);
+void usbd_dump_pipe(usbd_pipe_handle);
#endif
/* Routines from usb_subr.c */
@@ -295,15 +295,15 @@ void usb_delay_ms(usbd_bus_handle, u_in
void usbd_delay_ms_locked(usbd_device_handle, u_int, kmutex_t *);
void usbd_delay_ms(usbd_device_handle, u_int);
usbd_status usbd_reset_port(usbd_device_handle, int, usb_port_status_t *);
-usbd_status usbd_setup_pipe(usbd_device_handle dev,
- usbd_interface_handle iface,
+usbd_status usbd_setup_pipe(usbd_device_handle,
+ usbd_interface_handle,
struct usbd_endpoint *, int,
- usbd_pipe_handle *pipe);
-usbd_status usbd_setup_pipe_flags(usbd_device_handle dev,
- usbd_interface_handle iface,
+ usbd_pipe_handle *);
+usbd_status usbd_setup_pipe_flags(usbd_device_handle,
+ usbd_interface_handle,
struct usbd_endpoint *, int,
- usbd_pipe_handle *pipe,
- uint8_t flags);
+ usbd_pipe_handle *,
+ uint8_t);
usbd_status usbd_new_device(device_t, usbd_bus_handle, int, int, int,
struct usbd_port *);
usbd_status usbd_reattach_device(device_t, usbd_device_handle,
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.38.6.5 src/sys/dev/usb/usscanner.c:1.38.6.6
--- src/sys/dev/usb/usscanner.c:1.38.6.5 Fri Dec 5 09:37:50 2014
+++ src/sys/dev/usb/usscanner.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.38.6.5 2014/12/05 09:37:50 skrll Exp $ */
+/* $NetBSD: usscanner.c,v 1.38.6.6 2014/12/06 08:27:23 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.5 2014/12/05 09:37:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.38.6.6 2014/12/06 08:27:23 skrll Exp $");
#include "scsibus.h"
#include <sys/param.h>
@@ -132,12 +132,12 @@ struct usscanner_softc {
};
-Static void usscanner_cleanup(struct usscanner_softc *sc);
-Static void usscanner_scsipi_request(struct scsipi_channel *chan,
- scsipi_adapter_req_t req, void *arg);
-Static void usscanner_scsipi_minphys(struct buf *bp);
-Static void usscanner_done(struct usscanner_softc *sc);
-Static void usscanner_sense(struct usscanner_softc *sc);
+Static void usscanner_cleanup(struct usscanner_softc *);
+Static void usscanner_scsipi_request(struct scsipi_channel *,
+ scsipi_adapter_req_t, void *);
+Static void usscanner_scsipi_minphys(struct buf *);
+Static void usscanner_done(struct usscanner_softc *);
+Static void usscanner_sense(struct usscanner_softc *);
typedef void callback(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static callback usscanner_intr_cb;
Static callback usscanner_cmd_cb;
Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.33.10.5 src/sys/dev/usb/ustir.c:1.33.10.6
--- src/sys/dev/usb/ustir.c:1.33.10.5 Fri Dec 5 09:37:50 2014
+++ src/sys/dev/usb/ustir.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.33.10.5 2014/12/05 09:37:50 skrll Exp $ */
+/* $NetBSD: ustir.c,v 1.33.10.6 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.33.10.5 2014/12/05 09:37:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.33.10.6 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -138,19 +138,19 @@ struct ustir_softc {
#define USTIR_WR_TIMEOUT 200
-Static int ustir_activate(device_t self, enum devact act);
-Static int ustir_open(void *h, int flag, int mode, struct lwp *l);
-Static int ustir_close(void *h, int flag, int mode, struct lwp *l);
-Static int ustir_read(void *h, struct uio *uio, int flag);
-Static int ustir_write(void *h, struct uio *uio, int flag);
-Static int ustir_set_params(void *h, struct irda_params *params);
-Static int ustir_get_speeds(void *h, int *speeds);
-Static int ustir_get_turnarounds(void *h, int *times);
-Static int ustir_poll(void *h, int events, struct lwp *l);
-Static int ustir_kqfilter(void *h, struct knote *kn);
+Static int ustir_activate(device_t, enum devact);
+Static int ustir_open(void *, int, int, struct lwp *);
+Static int ustir_close(void *, int, int, struct lwp *);
+Static int ustir_read(void *, struct uio *, int);
+Static int ustir_write(void *, struct uio *, int);
+Static int ustir_set_params(void *, struct irda_params *);
+Static int ustir_get_speeds(void *, int *);
+Static int ustir_get_turnarounds(void *, int *);
+Static int ustir_poll(void *, int, struct lwp *);
+Static int ustir_kqfilter(void *, struct knote *);
#ifdef USTIR_DEBUG_IOCTLS
-Static int ustir_ioctl(void *h, u_long cmd, void *addr, int flag, struct lwp *l);
+Static int ustir_ioctl(void *, u_long, void *, int, struct lwp *);
#endif
Static struct irframe_methods const ustir_methods = {
Index: src/sys/dev/usb/uts.c
diff -u src/sys/dev/usb/uts.c:1.3.14.2 src/sys/dev/usb/uts.c:1.3.14.3
--- src/sys/dev/usb/uts.c:1.3.14.2 Wed Dec 3 22:33:56 2014
+++ src/sys/dev/usb/uts.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uts.c,v 1.3.14.2 2014/12/03 22:33:56 skrll Exp $ */
+/* $NetBSD: uts.c,v 1.3.14.3 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.3.14.2 2014/12/03 22:33:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.3.14.3 2014/12/06 08:27:23 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@ struct uts_softc {
#define TSCREEN_FLAGS_MASK (HIO_CONST|HIO_RELATIVE)
-Static void uts_intr(struct uhidev *addr, void *ibuf, u_int len);
+Static void uts_intr(struct uhidev *, void *, u_int);
Static int uts_enable(void *);
Static void uts_disable(void *);
Index: src/sys/dev/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.41.2.4 src/sys/dev/usb/uvideo.c:1.41.2.5
--- src/sys/dev/usb/uvideo.c:1.41.2.4 Wed Dec 3 22:33:56 2014
+++ src/sys/dev/usb/uvideo.c Sat Dec 6 08:27:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.41.2.4 2014/12/03 22:33:56 skrll Exp $ */
+/* $NetBSD: uvideo.c,v 1.41.2.5 2014/12/06 08:27:23 skrll Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.41.2.4 2014/12/03 22:33:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.41.2.5 2014/12/06 08:27:23 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -323,14 +323,14 @@ static struct uvideo_format * uvideo_str
enum video_pixel_format, uint32_t, uint32_t);
static struct uvideo_stream * uvideo_stream_alloc(void);
static usbd_status uvideo_stream_init(
- struct uvideo_stream *stream,
- struct uvideo_softc *sc,
- const usb_interface_descriptor_t *ifdesc,
- uint8_t idx);
+ struct uvideo_stream *,
+ struct uvideo_softc *,
+ const usb_interface_descriptor_t *,
+ uint8_t);
static usbd_status uvideo_stream_init_desc(
struct uvideo_stream *,
- const usb_interface_descriptor_t *ifdesc,
- usbd_desc_iter_t *iter);
+ const usb_interface_descriptor_t *,
+ usbd_desc_iter_t *);
static usbd_status uvideo_stream_init_frame_based_format(
struct uvideo_stream *,
const uvideo_descriptor_t *,
