Module Name: src
Committed By: skrll
Date: Tue Sep 29 11:38:29 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: aubtfwl.c if_rum.c if_rumreg.h if_run.c
if_runvar.h if_ural.c if_uralreg.h if_urtw.c if_zyd.c if_zydreg.h
uatp.c uaudio.c uchcom.c uhci.c uhcivar.h uhid.c uhidev.c uhub.c
ukyopon.c umass_isdata.c umass_scsipi.c umcs.c umidi.c usb.c
usb_mem.c usb_subr.c usbdi.h usbdi_util.c usscanner.c uvisor.c
xhci.c
Log Message:
sizeof KNF
To generate a diff of this commit:
cvs rdiff -u -r1.5.10.6 -r1.5.10.7 src/sys/dev/usb/aubtfwl.c
cvs rdiff -u -r1.48.6.8 -r1.48.6.9 src/sys/dev/usb/if_rum.c
cvs rdiff -u -r1.4 -r1.4.34.1 src/sys/dev/usb/if_rumreg.h
cvs rdiff -u -r1.10.6.5 -r1.10.6.6 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.1.20.1 -r1.1.20.2 src/sys/dev/usb/if_runvar.h
cvs rdiff -u -r1.44.14.5 -r1.44.14.6 src/sys/dev/usb/if_ural.c
cvs rdiff -u -r1.3 -r1.3.128.1 src/sys/dev/usb/if_uralreg.h
cvs rdiff -u -r1.6.6.8 -r1.6.6.9 src/sys/dev/usb/if_urtw.c
cvs rdiff -u -r1.36.14.6 -r1.36.14.7 src/sys/dev/usb/if_zyd.c
cvs rdiff -u -r1.7.16.2 -r1.7.16.3 src/sys/dev/usb/if_zydreg.h
cvs rdiff -u -r1.10.4.5 -r1.10.4.6 src/sys/dev/usb/uatp.c
cvs rdiff -u -r1.140.2.9 -r1.140.2.10 src/sys/dev/usb/uaudio.c
cvs rdiff -u -r1.13.6.5 -r1.13.6.6 src/sys/dev/usb/uchcom.c
cvs rdiff -u -r1.264.4.34 -r1.264.4.35 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.52.14.6 -r1.52.14.7 src/sys/dev/usb/uhcivar.h
cvs rdiff -u -r1.92.4.6 -r1.92.4.7 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.61.4.8 -r1.61.4.9 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.126.2.14 -r1.126.2.15 src/sys/dev/usb/uhub.c
cvs rdiff -u -r1.16.16.4 -r1.16.16.5 src/sys/dev/usb/ukyopon.c
cvs rdiff -u -r1.30.2.4 -r1.30.2.5 src/sys/dev/usb/umass_isdata.c
cvs rdiff -u -r1.49.2.2 -r1.49.2.3 src/sys/dev/usb/umass_scsipi.c
cvs rdiff -u -r1.8.2.4 -r1.8.2.5 src/sys/dev/usb/umcs.c
cvs rdiff -u -r1.65.14.6 -r1.65.14.7 src/sys/dev/usb/umidi.c
cvs rdiff -u -r1.156.2.9 -r1.156.2.10 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.65.2.9 -r1.65.2.10 src/sys/dev/usb/usb_mem.c
cvs rdiff -u -r1.198.2.17 -r1.198.2.18 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.90.4.6 -r1.90.4.7 src/sys/dev/usb/usbdi.h
cvs rdiff -u -r1.63.2.10 -r1.63.2.11 src/sys/dev/usb/usbdi_util.c
cvs rdiff -u -r1.38.6.8 -r1.38.6.9 src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.45.24.5 -r1.45.24.6 src/sys/dev/usb/uvisor.c
cvs rdiff -u -r1.28.2.38 -r1.28.2.39 src/sys/dev/usb/xhci.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/aubtfwl.c
diff -u src/sys/dev/usb/aubtfwl.c:1.5.10.6 src/sys/dev/usb/aubtfwl.c:1.5.10.7
--- src/sys/dev/usb/aubtfwl.c:1.5.10.6 Tue Jun 23 12:07:20 2015
+++ src/sys/dev/usb/aubtfwl.c Tue Sep 29 11:38:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: aubtfwl.c,v 1.5.10.6 2015/06/23 12:07:20 skrll Exp $ */
+/* $NetBSD: aubtfwl.c,v 1.5.10.7 2015/09/29 11:38:28 skrll Exp $ */
/*
* Copyright (c) 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aubtfwl.c,v 1.5.10.6 2015/06/23 12:07:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aubtfwl.c,v 1.5.10.7 2015/09/29 11:38:28 skrll Exp $");
#include <sys/param.h>
#include <dev/usb/usb.h>
@@ -119,7 +119,7 @@ aubtfwl_firmware_load(device_t self, con
size_t fwo = 0;
uint32_t n;
- memset(&req, 0, sizeof req);
+ memset(&req, 0, sizeof(req));
error = firmware_open("ubt", name, &fwh);
if (error != 0) {
@@ -218,13 +218,13 @@ aubtfwl_get_state(struct aubtfwl_softc *
usb_device_request_t req;
int error = 0;
- memset(&req, 0, sizeof req);
+ memset(&req, 0, sizeof(req));
req.bRequest = AR3K_GET_STATE;
req.bmRequestType = UT_READ_VENDOR_DEVICE;
USETW(req.wValue, 0);
USETW(req.wIndex, 0);
- USETW(req.wLength, sizeof *state);
+ USETW(req.wLength, sizeof(*state));
error = usbd_do_request(sc->sc_udev, &req, state);
@@ -236,13 +236,13 @@ aubtfwl_get_version(struct aubtfwl_softc
usb_device_request_t req;
int error = 0;
- memset(&req, 0, sizeof req);
+ memset(&req, 0, sizeof(req));
req.bRequest = AR3K_GET_VERSION;
req.bmRequestType = UT_READ_VENDOR_DEVICE;
USETW(req.wValue, 0);
USETW(req.wIndex, 0);
- USETW(req.wLength, sizeof *ver);
+ USETW(req.wLength, sizeof(*ver));
error = usbd_do_request(sc->sc_udev, &req, ver);
@@ -261,7 +261,7 @@ aubtfwl_send_command(struct aubtfwl_soft
usb_device_request_t req;
int error = 0;
- memset(&req, 0, sizeof req);
+ memset(&req, 0, sizeof(req));
req.bRequest = cmd;
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
@@ -298,7 +298,7 @@ aubtfwl_attach_hook(device_t self)
aprint_verbose_dev(self, "state is 0x%02x\n", state);
if (!(state & AR3K_STATE_IS_PATCHED)) {
- snprintf(firmware_name, sizeof firmware_name,
+ snprintf(firmware_name, sizeof(firmware_name),
"ar3k/AthrBT_0x%08x.dfu", ver.rom);
error = aubtfwl_firmware_load(self, firmware_name);
@@ -318,7 +318,7 @@ aubtfwl_attach_hook(device_t self)
break;
}
- snprintf(firmware_name, sizeof firmware_name,
+ snprintf(firmware_name, sizeof(firmware_name),
"ar3k/ramps_0x%08x_%d.dfu", ver.rom, clock);
aubtfwl_firmware_load(self, firmware_name);
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.48.6.8 src/sys/dev/usb/if_rum.c:1.48.6.9
--- src/sys/dev/usb/if_rum.c:1.48.6.8 Tue Sep 22 12:06:01 2015
+++ src/sys/dev/usb/if_rum.c Tue Sep 29 11:38:28 2015
@@ -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.8 2015/09/22 12:06:01 skrll Exp $ */
+/* $NetBSD: if_rum.c,v 1.48.6.9 2015/09/29 11:38:28 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.8 2015/09/22 12:06:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.48.6.9 2015/09/29 11:38:28 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -466,14 +466,14 @@ rum_attach(device_t parent, device_t sel
ieee80211_media_init(ic, rum_media_change, ieee80211_media_status);
bpf_attach2(ifp, DLT_IEEE802_11_RADIO,
- sizeof (struct ieee80211_frame) + IEEE80211_RADIOTAP_HDRLEN,
+ sizeof(struct ieee80211_frame) + IEEE80211_RADIOTAP_HDRLEN,
&sc->sc_drvbpf);
- sc->sc_rxtap_len = sizeof sc->sc_rxtapu;
+ sc->sc_rxtap_len = sizeof(sc->sc_rxtapu);
sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len);
sc->sc_rxtap.wr_ihdr.it_present = htole32(RT2573_RX_RADIOTAP_PRESENT);
- sc->sc_txtap_len = sizeof sc->sc_txtapu;
+ sc->sc_txtap_len = sizeof(sc->sc_txtapu);
sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len);
sc->sc_txtap.wt_ihdr.it_present = htole32(RT2573_TX_RADIOTAP_PRESENT);
@@ -1443,7 +1443,7 @@ rum_read(struct rum_softc *sc, uint16_t
{
uint32_t val;
- rum_read_multi(sc, reg, &val, sizeof val);
+ rum_read_multi(sc, reg, &val, sizeof(val));
return le32toh(val);
}
@@ -1472,7 +1472,7 @@ rum_write(struct rum_softc *sc, uint16_t
{
uint32_t tmp = htole32(val);
- rum_write_multi(sc, reg, &tmp, sizeof tmp);
+ rum_write_multi(sc, reg, &tmp, sizeof(tmp));
}
static void
@@ -1923,7 +1923,7 @@ rum_read_eeprom(struct rum_softc *sc)
/* read Tx power for all a/b/g channels */
rum_eeprom_read(sc, RT2573_EEPROM_TXPOWER, sc->txpow, 14);
/* XXX default Tx power for 802.11a channels */
- memset(sc->txpow + 14, 24, sizeof (sc->txpow) - 14);
+ memset(sc->txpow + 14, 24, sizeof(sc->txpow) - 14);
#ifdef RUM_DEBUG
for (i = 0; i < 14; i++)
DPRINTF(("Channel=%d Tx power=%d\n", i + 1, sc->txpow[i]));
@@ -2024,7 +2024,7 @@ rum_init(struct ifnet *ifp)
rum_set_chan(sc, ic->ic_curchan);
/* clear STA registers */
- rum_read_multi(sc, RT2573_STA_CSR0, sc->sta, sizeof sc->sta);
+ rum_read_multi(sc, RT2573_STA_CSR0, sc->sta, sizeof(sc->sta));
IEEE80211_ADDR_COPY(ic->ic_myaddr, CLLADDR(ifp->if_sadl));
rum_set_macaddr(sc, ic->ic_myaddr);
@@ -2237,7 +2237,7 @@ rum_amrr_start(struct rum_softc *sc, str
int i;
/* clear statistic registers (STA_CSR0 to STA_CSR5) */
- rum_read_multi(sc, RT2573_STA_CSR0, sc->sta, sizeof sc->sta);
+ rum_read_multi(sc, RT2573_STA_CSR0, sc->sta, sizeof(sc->sta));
ieee80211_amrr_node_init(&sc->amrr, &sc->amn);
@@ -2263,10 +2263,10 @@ rum_amrr_timeout(void *arg)
req.bRequest = RT2573_READ_MULTI_MAC;
USETW(req.wValue, 0);
USETW(req.wIndex, RT2573_STA_CSR0);
- USETW(req.wLength, sizeof sc->sta);
+ USETW(req.wLength, sizeof(sc->sta));
usbd_setup_default_xfer(sc->amrr_xfer, sc->sc_udev, sc,
- USBD_DEFAULT_TIMEOUT, &req, sc->sta, sizeof sc->sta, 0,
+ USBD_DEFAULT_TIMEOUT, &req, sc->sta, sizeof(sc->sta), 0,
rum_amrr_update);
(void)usbd_transfer(sc->amrr_xfer);
}
Index: src/sys/dev/usb/if_rumreg.h
diff -u src/sys/dev/usb/if_rumreg.h:1.4 src/sys/dev/usb/if_rumreg.h:1.4.34.1
--- src/sys/dev/usb/if_rumreg.h:1.4 Mon Feb 21 23:50:42 2011
+++ src/sys/dev/usb/if_rumreg.h Tue Sep 29 11:38:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rumreg.h,v 1.4 2011/02/21 23:50:42 jmcneill Exp $ */
+/* $NetBSD: if_rumreg.h,v 1.4.34.1 2015/09/29 11:38:28 skrll Exp $ */
/* $OpenBSD: if_rumreg.h,v 1.14 2009/08/10 18:04:56 damien Exp $ */
/*-
@@ -18,8 +18,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RT2573_TX_DESC_SIZE (sizeof (struct rum_tx_desc))
-#define RT2573_RX_DESC_SIZE (sizeof (struct rum_rx_desc))
+#define RT2573_TX_DESC_SIZE (sizeof(struct rum_tx_desc))
+#define RT2573_RX_DESC_SIZE (sizeof(struct rum_rx_desc))
#define RT2573_CONFIG_NO 1
#define RT2573_IFACE_INDEX 0
Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.10.6.5 src/sys/dev/usb/if_run.c:1.10.6.6
--- src/sys/dev/usb/if_run.c:1.10.6.5 Mon Apr 6 15:18:13 2015
+++ src/sys/dev/usb/if_run.c Tue Sep 29 11:38:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_run.c,v 1.10.6.5 2015/04/06 15:18:13 skrll Exp $ */
+/* $NetBSD: if_run.c,v 1.10.6.6 2015/09/29 11:38:28 skrll Exp $ */
/* $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.10.6.5 2015/04/06 15:18:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.10.6.6 2015/09/29 11:38:28 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -796,8 +796,8 @@ run_alloc_tx_ring(struct run_softc *sc,
goto fail;
}
/* zeroize the TXD + TXWI part */
- memset(data->buf, 0, sizeof (struct rt2870_txd) +
- sizeof (struct rt2860_txwi));
+ memset(data->buf, 0, sizeof(struct rt2870_txd) +
+ sizeof(struct rt2860_txwi));
}
if (error != 0)
fail: run_free_tx_ring(sc, qid);
@@ -911,7 +911,7 @@ run_read(struct run_softc *sc, uint16_t
uint32_t tmp;
int error;
- error = run_read_region_1(sc, reg, (uint8_t *)&tmp, sizeof tmp);
+ error = run_read_region_1(sc, reg, (uint8_t *)&tmp, sizeof(tmp));
if (error == 0)
*val = le32toh(tmp);
else
@@ -1048,7 +1048,7 @@ run_eeprom_read_2(struct run_softc *sc,
req.bRequest = RT2870_EEPROM_READ;
USETW(req.wValue, 0);
USETW(req.wIndex, addr);
- USETW(req.wLength, sizeof tmp);
+ USETW(req.wLength, sizeof(tmp));
error = usbd_do_request(sc->sc_udev, &req, &tmp);
if (error == 0)
*val = le16toh(tmp);
@@ -1507,7 +1507,7 @@ static struct ieee80211_node *
run_node_alloc(struct ieee80211_node_table *nt)
{
struct run_node *rn =
- malloc(sizeof (struct run_node), M_DEVBUF, M_NOWAIT | M_ZERO);
+ malloc(sizeof(struct run_node), M_DEVBUF, M_NOWAIT | M_ZERO);
return rn ? &rn->ni : NULL;
}
@@ -1584,7 +1584,7 @@ run_do_async(struct run_softc *sc, void
s = splusb();
cmd = &ring->cmd[ring->cur];
cmd->cb = cb;
- KASSERT(len <= sizeof (cmd->data));
+ KASSERT(len <= sizeof(cmd->data));
memcpy(cmd->data, arg, len);
ring->cur = (ring->cur + 1) % RUN_HOST_CMD_RING_COUNT;
@@ -1606,7 +1606,7 @@ run_newstate(struct ieee80211com *ic, en
/* do it in a process context */
cmd.state = nstate;
cmd.arg = arg;
- run_do_async(sc, run_newstate_cb, &cmd, sizeof cmd);
+ run_do_async(sc, run_newstate_cb, &cmd, sizeof(cmd));
return 0;
}
@@ -1682,7 +1682,7 @@ run_newstate_cb(struct run_softc *sc, vo
/* clear statistic registers used by AMRR */
run_read_region_1(sc, RT2860_TX_STA_CNT0,
- (uint8_t *)sta, sizeof sta);
+ (uint8_t *)sta, sizeof(sta));
/* start calibration timer */
callout_schedule(&sc->calib_to, hz);
}
@@ -1760,7 +1760,7 @@ run_set_key(struct ieee80211com *ic, con
/* do it in a process context */
cmd.key = *k;
cmd.associd = (ni != NULL) ? ni->ni_associd : 0;
- run_do_async(sc, run_set_key_cb, &cmd, sizeof cmd);
+ run_do_async(sc, run_set_key_cb, &cmd, sizeof(cmd));
return 1;
}
@@ -1825,7 +1825,7 @@ run_set_key_cb(struct run_softc *sc, voi
(k->wk_flags & IEEE80211_KEY_XMIT)) {
/* set initial packet number in IV+EIV */
if (k->wk_cipher->ic_cipher == IEEE80211_CIPHER_WEP) {
- memset(iv, 0, sizeof iv);
+ memset(iv, 0, sizeof(iv));
iv[3] = sc->sc_ic.ic_crypto.cs_def_txkey << 6;
} else {
if (k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP) {
@@ -1870,7 +1870,7 @@ run_delete_key(struct ieee80211com *ic,
/* do it in a process context */
cmd.key = *k;
cmd.associd = (ni != NULL) ? ni->ni_associd : 0;
- run_do_async(sc, run_delete_key_cb, &cmd, sizeof cmd);
+ run_do_async(sc, run_delete_key_cb, &cmd, sizeof(cmd));
return 1;
}
@@ -1920,7 +1920,7 @@ run_calibrate_cb(struct run_softc *sc, v
/* read statistic counters (clear on read) and update AMRR state */
error = run_read_region_1(sc, RT2860_TX_STA_CNT0, (uint8_t *)sta,
- sizeof sta);
+ sizeof(sta));
if (error != 0)
goto skip;
@@ -2184,7 +2184,7 @@ run_rxeof(struct usbd_xfer *xfer, void *
dmalen + 8, xferlen));
break;
}
- run_rx_frame(sc, buf + sizeof (uint32_t), dmalen);
+ run_rx_frame(sc, buf + sizeof(uint32_t), dmalen);
buf += dmalen + 8;
xferlen -= dmalen + 8;
}
@@ -2284,7 +2284,7 @@ run_tx(struct run_softc *sc, struct mbuf
/* get MCS code from rate index */
mcs = rt2860_rates[ridx].mcs;
- xferlen = sizeof (*txwi) + m->m_pkthdr.len;
+ xferlen = sizeof(*txwi) + m->m_pkthdr.len;
/* roundup to 32-bit alignment */
xferlen = (xferlen + 3) & ~3;
@@ -2347,7 +2347,7 @@ run_tx(struct run_softc *sc, struct mbuf
m_copydata(m, 0, m->m_pkthdr.len, (void *)(txwi + 1));
m_freem(m);
- xferlen += sizeof (*txd) + 4;
+ xferlen += sizeof(*txd) + 4;
usbd_setup_xfer(data->xfer, ring->pipeh, data, data->buf, xferlen,
USBD_FORCE_SHORT_XFER, RUN_TX_TIMEOUT, run_txeof);
@@ -3710,7 +3710,7 @@ run_setup_beacon(struct run_softc *sc)
if ((m = ieee80211_beacon_alloc(ic, ic->ic_bss, &sc->sc_bo)) == NULL)
return ENOBUFS;
- memset(&txwi, 0, sizeof txwi);
+ memset(&txwi, 0, sizeof(txwi));
txwi.wcid = 0xff;
txwi.len = htole16(m->m_pkthdr.len);
/* send beacons at the lowest available rate */
@@ -3723,8 +3723,8 @@ run_setup_beacon(struct run_softc *sc)
txwi.flags = RT2860_TX_TS;
run_write_region_1(sc, RT2860_BCN_BASE(0),
- (uint8_t *)&txwi, sizeof txwi);
- run_write_region_1(sc, RT2860_BCN_BASE(0) + sizeof txwi,
+ (uint8_t *)&txwi, sizeof(txwi));
+ run_write_region_1(sc, RT2860_BCN_BASE(0) + sizeof(txwi),
mtod(m, uint8_t *), m->m_pkthdr.len);
m_freem(m);
Index: src/sys/dev/usb/if_runvar.h
diff -u src/sys/dev/usb/if_runvar.h:1.1.20.1 src/sys/dev/usb/if_runvar.h:1.1.20.2
--- src/sys/dev/usb/if_runvar.h:1.1.20.1 Thu Mar 19 17:26:42 2015
+++ src/sys/dev/usb/if_runvar.h Tue Sep 29 11:38:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_runvar.h,v 1.1.20.1 2015/03/19 17:26:42 skrll Exp $ */
+/* $NetBSD: if_runvar.h,v 1.1.20.2 2015/09/29 11:38:28 skrll Exp $ */
/* $OpenBSD: if_runvar.h,v 1.8 2010/02/08 18:46:47 damien Exp $ */
/*-
@@ -20,16 +20,16 @@
#define RUN_MAX_RXSZ \
4096
#if 0
- (sizeof (uint32_t) + \
- sizeof (struct rt2860_rxwi) + \
- sizeof (uint16_t) + \
+ (sizeof(uint32_t) + \
+ sizeof(struct rt2860_rxwi) + \
+ sizeof(uint16_t) + \
MCLBYTES + \
- sizeof (struct rt2870_rxd))
+ sizeof(struct rt2870_rxd))
#endif
/* NB: "11" is the maximum number of padding bytes needed for Tx */
#define RUN_MAX_TXSZ \
- (sizeof (struct rt2870_txd) + \
- sizeof (struct rt2860_rxwi) + \
+ (sizeof(struct rt2870_txd) + \
+ sizeof(struct rt2860_rxwi) + \
MCLBYTES + 11)
#define RUN_TX_TIMEOUT 5000 /* ms */
Index: src/sys/dev/usb/if_ural.c
diff -u src/sys/dev/usb/if_ural.c:1.44.14.5 src/sys/dev/usb/if_ural.c:1.44.14.6
--- src/sys/dev/usb/if_ural.c:1.44.14.5 Sat Jun 6 14:40:14 2015
+++ src/sys/dev/usb/if_ural.c Tue Sep 29 11:38:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ural.c,v 1.44.14.5 2015/06/06 14:40:14 skrll Exp $ */
+/* $NetBSD: if_ural.c,v 1.44.14.6 2015/09/29 11:38:28 skrll Exp $ */
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.44.14.5 2015/06/06 14:40:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.44.14.6 2015/09/29 11:38:28 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -508,13 +508,13 @@ ural_attach(device_t parent, device_t se
ieee80211_media_init(ic, ural_media_change, ieee80211_media_status);
bpf_attach2(ifp, DLT_IEEE802_11_RADIO,
- sizeof (struct ieee80211_frame) + 64, &sc->sc_drvbpf);
+ sizeof(struct ieee80211_frame) + 64, &sc->sc_drvbpf);
- sc->sc_rxtap_len = sizeof sc->sc_rxtapu;
+ sc->sc_rxtap_len = sizeof(sc->sc_rxtapu);
sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len);
sc->sc_rxtap.wr_ihdr.it_present = htole32(RAL_RX_RADIOTAP_PRESENT);
- sc->sc_txtap_len = sizeof sc->sc_txtapu;
+ sc->sc_txtap_len = sizeof(sc->sc_txtapu);
sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len);
sc->sc_txtap.wt_ihdr.it_present = htole32(RAL_TX_RADIOTAP_PRESENT);
@@ -1114,7 +1114,7 @@ ural_setup_tx_desc(struct ural_softc *sc
desc->flags |= htole32(len << 16);
desc->wme = htole16(RAL_AIFSN(2) | RAL_LOGCWMIN(3) | RAL_LOGCWMAX(5));
- desc->wme |= htole16(RAL_IVOFFSET(sizeof (struct ieee80211_frame)));
+ desc->wme |= htole16(RAL_IVOFFSET(sizeof(struct ieee80211_frame)));
/* setup PLCP fields */
desc->plcp_signal = ural_plcp_signal(rate);
@@ -1172,7 +1172,7 @@ ural_tx_bcn(struct ural_softc *sc, struc
return ENOMEM;
}
- usbd_setup_xfer(xfer, sc->sc_tx_pipeh, NULL, &cmd, sizeof cmd,
+ usbd_setup_xfer(xfer, sc->sc_tx_pipeh, NULL, &cmd, sizeof(cmd),
USBD_FORCE_SHORT_XFER, RAL_TX_TIMEOUT, NULL);
error = usbd_sync_transfer(xfer);
@@ -1414,8 +1414,8 @@ ural_start(struct ifnet *ifp)
break;
}
- if (m0->m_len < sizeof (struct ether_header) &&
- !(m0 = m_pullup(m0, sizeof (struct ether_header))))
+ if (m0->m_len < sizeof(struct ether_header) &&
+ !(m0 = m_pullup(m0, sizeof(struct ether_header))))
continue;
eh = mtod(m0, struct ether_header *);
@@ -1588,7 +1588,7 @@ ural_read(struct ural_softc *sc, uint16_
req.bRequest = RAL_READ_MAC;
USETW(req.wValue, 0);
USETW(req.wIndex, reg);
- USETW(req.wLength, sizeof (uint16_t));
+ USETW(req.wLength, sizeof(uint16_t));
error = usbd_do_request(sc->sc_udev, &req, &val);
if (error != 0) {
@@ -2157,7 +2157,7 @@ ural_init(struct ifnet *ifp)
ural_set_chan(sc, ic->ic_curchan);
/* clear statistic registers (STA_CSR0 to STA_CSR10) */
- ural_read_multi(sc, RAL_STA_CSR0, sc->sta, sizeof sc->sta);
+ ural_read_multi(sc, RAL_STA_CSR0, sc->sta, sizeof(sc->sta));
ural_set_txantenna(sc, sc->tx_ant);
ural_set_rxantenna(sc, sc->rx_ant);
@@ -2318,7 +2318,7 @@ ural_amrr_start(struct ural_softc *sc, s
int i;
/* clear statistic registers (STA_CSR0 to STA_CSR10) */
- ural_read_multi(sc, RAL_STA_CSR0, sc->sta, sizeof sc->sta);
+ ural_read_multi(sc, RAL_STA_CSR0, sc->sta, sizeof(sc->sta));
ieee80211_amrr_node_init(&sc->amrr, &sc->amn);
@@ -2347,10 +2347,10 @@ ural_amrr_timeout(void *arg)
req.bRequest = RAL_READ_MULTI_MAC;
USETW(req.wValue, 0);
USETW(req.wIndex, RAL_STA_CSR0);
- USETW(req.wLength, sizeof sc->sta);
+ USETW(req.wLength, sizeof(sc->sta));
usbd_setup_default_xfer(sc->amrr_xfer, sc->sc_udev, sc,
- USBD_DEFAULT_TIMEOUT, &req, sc->sta, sizeof sc->sta, 0,
+ USBD_DEFAULT_TIMEOUT, &req, sc->sta, sizeof(sc->sta), 0,
ural_amrr_update);
(void)usbd_transfer(sc->amrr_xfer);
Index: src/sys/dev/usb/if_uralreg.h
diff -u src/sys/dev/usb/if_uralreg.h:1.3 src/sys/dev/usb/if_uralreg.h:1.3.128.1
--- src/sys/dev/usb/if_uralreg.h:1.3 Wed Jul 5 18:46:42 2006
+++ src/sys/dev/usb/if_uralreg.h Tue Sep 29 11:38:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_uralreg.h,v 1.3 2006/07/05 18:46:42 perry Exp $ */
+/* $NetBSD: if_uralreg.h,v 1.3.128.1 2015/09/29 11:38:28 skrll Exp $ */
/* $OpenBSD: if_ralreg.h,v 1.5 2005/04/01 13:13:43 damien Exp $ */
/*-
@@ -18,8 +18,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#define RAL_RX_DESC_SIZE (sizeof (struct ural_rx_desc))
-#define RAL_TX_DESC_SIZE (sizeof (struct ural_tx_desc))
+#define RAL_RX_DESC_SIZE (sizeof(struct ural_rx_desc))
+#define RAL_TX_DESC_SIZE (sizeof(struct ural_tx_desc))
#define RAL_CONFIG_NO 1
#define RAL_IFACE_INDEX 0
Index: src/sys/dev/usb/if_urtw.c
diff -u src/sys/dev/usb/if_urtw.c:1.6.6.8 src/sys/dev/usb/if_urtw.c:1.6.6.9
--- src/sys/dev/usb/if_urtw.c:1.6.6.8 Sat Mar 21 11:33:37 2015
+++ src/sys/dev/usb/if_urtw.c Tue Sep 29 11:38:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtw.c,v 1.6.6.8 2015/03/21 11:33:37 skrll Exp $ */
+/* $NetBSD: if_urtw.c,v 1.6.6.9 2015/09/29 11:38:28 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.8 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.6.6.9 2015/09/29 11:38:28 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -740,11 +740,11 @@ urtw_attach(device_t parent, device_t se
sizeof(struct ieee80211_frame) + IEEE80211_RADIOTAP_HDRLEN,
&sc->sc_drvbpf);
- sc->sc_rxtap_len = sizeof sc->sc_rxtapu;
+ sc->sc_rxtap_len = sizeof(sc->sc_rxtapu);
sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len);
sc->sc_rxtap.wr_ihdr.it_present = htole32(URTW_RX_RADIOTAP_PRESENT);
- sc->sc_txtap_len = sizeof sc->sc_txtapu;
+ sc->sc_txtap_len = sizeof(sc->sc_txtapu);
sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len);
sc->sc_txtap.wt_ihdr.it_present = htole32(URTW_TX_RADIOTAP_PRESENT);
Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.36.14.6 src/sys/dev/usb/if_zyd.c:1.36.14.7
--- src/sys/dev/usb/if_zyd.c:1.36.14.6 Mon Apr 6 15:18:13 2015
+++ src/sys/dev/usb/if_zyd.c Tue Sep 29 11:38:28 2015
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
-/* $NetBSD: if_zyd.c,v 1.36.14.6 2015/04/06 15:18:13 skrll Exp $ */
+/* $NetBSD: if_zyd.c,v 1.36.14.7 2015/09/29 11:38:28 skrll Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <[email protected]>
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.36.14.6 2015/04/06 15:18:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.36.14.7 2015/09/29 11:38:28 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -438,14 +438,14 @@ zyd_complete_attach(struct zyd_softc *sc
ieee80211_media_init(ic, zyd_media_change, ieee80211_media_status);
bpf_attach2(ifp, DLT_IEEE802_11_RADIO,
- sizeof (struct ieee80211_frame) + IEEE80211_RADIOTAP_HDRLEN,
+ sizeof(struct ieee80211_frame) + IEEE80211_RADIOTAP_HDRLEN,
&sc->sc_drvbpf);
- sc->sc_rxtap_len = sizeof sc->sc_rxtapu;
+ sc->sc_rxtap_len = sizeof(sc->sc_rxtapu);
sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len);
sc->sc_rxtap.wr_ihdr.it_present = htole32(ZYD_RX_RADIOTAP_PRESENT);
- sc->sc_txtap_len = sizeof sc->sc_txtapu;
+ sc->sc_txtap_len = sizeof(sc->sc_txtapu);
sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len);
sc->sc_txtap.wt_ihdr.it_present = htole32(ZYD_TX_RADIOTAP_PRESENT);
@@ -597,7 +597,7 @@ zyd_alloc_tx_list(struct zyd_softc *sc)
}
/* clear Tx descriptor */
- memset(data->buf, 0, sizeof (struct zyd_tx_desc));
+ memset(data->buf, 0, sizeof(struct zyd_tx_desc));
}
return 0;
@@ -676,7 +676,7 @@ zyd_node_alloc(struct ieee80211_node_tab
{
struct zyd_node *zn;
- zn = malloc(sizeof (struct zyd_node), M_80211_NODE, M_NOWAIT | M_ZERO);
+ zn = malloc(sizeof(struct zyd_node), M_80211_NODE, M_NOWAIT | M_ZERO);
return &zn->ni;
}
@@ -816,12 +816,12 @@ zyd_cmd(struct zyd_softc *sc, uint16_t c
s = splusb();
rq.idata = idata;
rq.odata = odata;
- rq.len = olen / sizeof (struct zyd_pair);
+ rq.len = olen / sizeof(struct zyd_pair);
SIMPLEQ_INSERT_TAIL(&sc->sc_rqh, &rq, rq);
}
usbd_setup_xfer(xfer, sc->zyd_ep[ZYD_ENDPT_IOUT], 0, &cmd,
- sizeof (uint16_t) + ilen, xferflags, ZYD_INTR_TIMEOUT, NULL);
+ sizeof(uint16_t) + ilen, xferflags, ZYD_INTR_TIMEOUT, NULL);
uerror = usbd_transfer(xfer);
if (uerror != USBD_IN_PROGRESS && uerror != 0) {
if (flags & ZYD_CMD_FLAG_READ)
@@ -853,7 +853,7 @@ zyd_read16(struct zyd_softc *sc, uint16_
int error;
reg = htole16(reg);
- error = zyd_cmd(sc, ZYD_CMD_IORD, ®, sizeof reg, &tmp, sizeof tmp,
+ error = zyd_cmd(sc, ZYD_CMD_IORD, ®, sizeof(reg), &tmp, sizeof(tmp),
ZYD_CMD_FLAG_READ);
if (error == 0)
*val = le16toh(tmp.val);
@@ -871,7 +871,7 @@ zyd_read32(struct zyd_softc *sc, uint16_
regs[0] = htole16(ZYD_REG32_HI(reg));
regs[1] = htole16(ZYD_REG32_LO(reg));
- error = zyd_cmd(sc, ZYD_CMD_IORD, regs, sizeof regs, tmp, sizeof tmp,
+ error = zyd_cmd(sc, ZYD_CMD_IORD, regs, sizeof(regs), tmp, sizeof(tmp),
ZYD_CMD_FLAG_READ);
if (error == 0)
*val = le16toh(tmp[0].val) << 16 | le16toh(tmp[1].val);
@@ -888,7 +888,7 @@ zyd_write16(struct zyd_softc *sc, uint16
pair.reg = htole16(reg);
pair.val = htole16(val);
- return zyd_cmd(sc, ZYD_CMD_IOWR, &pair, sizeof pair, NULL, 0, 0);
+ return zyd_cmd(sc, ZYD_CMD_IOWR, &pair, sizeof(pair), NULL, 0, 0);
}
Static int
@@ -901,7 +901,7 @@ zyd_write32(struct zyd_softc *sc, uint16
pair[1].reg = htole16(ZYD_REG32_LO(reg));
pair[1].val = htole16(val & 0xffff);
- return zyd_cmd(sc, ZYD_CMD_IOWR, pair, sizeof pair, NULL, 0, 0);
+ return zyd_cmd(sc, ZYD_CMD_IOWR, pair, sizeof(pair), NULL, 0, 0);
}
Static int
@@ -1927,7 +1927,7 @@ zyd_rx_data(struct zyd_softc *sc, const
plcp = (const struct zyd_plcphdr *)buf;
stat = (const struct zyd_rx_stat *)
- (buf + len - sizeof (struct zyd_rx_stat));
+ (buf + len - sizeof(struct zyd_rx_stat));
if (stat->flags & ZYD_RX_ERROR) {
DPRINTF(("%s: RX status indicated error (%x)\n",
@@ -1937,8 +1937,8 @@ zyd_rx_data(struct zyd_softc *sc, const
}
/* compute actual frame length */
- rlen = len - sizeof (struct zyd_plcphdr) -
- sizeof (struct zyd_rx_stat) - IEEE80211_CRC_LEN;
+ rlen = len - sizeof(struct zyd_plcphdr) -
+ sizeof(struct zyd_rx_stat) - IEEE80211_CRC_LEN;
/* allocate a mbuf to store the frame */
MGETHDR(m, M_DONTWAIT, MT_DATA);
@@ -2019,7 +2019,7 @@ zyd_rxeof(struct usbd_xfer *xfer, void *
}
desc = (const struct zyd_rx_desc *)
- (data->buf + len - sizeof (struct zyd_rx_desc));
+ (data->buf + len - sizeof(struct zyd_rx_desc));
if (UGETW(desc->tag) == ZYD_TAG_MULTIFRAME) {
const uint8_t *p = data->buf, *end = p + len;
@@ -2082,7 +2082,7 @@ zyd_tx_mgt(struct zyd_softc *sc, struct
wh = mtod(m0, struct ieee80211_frame *);
- xferlen = sizeof (struct zyd_tx_desc) + m0->m_pkthdr.len;
+ xferlen = sizeof(struct zyd_tx_desc) + m0->m_pkthdr.len;
totlen = m0->m_pkthdr.len + IEEE80211_CRC_LEN;
/* fill Tx descriptor */
@@ -2117,7 +2117,7 @@ zyd_tx_mgt(struct zyd_softc *sc, struct
desc->phy |= ZYD_TX_PHY_SHPREAMBLE;
/* actual transmit length (XXX why +10?) */
- pktlen = sizeof (struct zyd_tx_desc) + 10;
+ pktlen = sizeof(struct zyd_tx_desc) + 10;
if (sc->mac_rev == ZYD_ZD1211)
pktlen += totlen;
desc->pktlen = htole16(pktlen);
@@ -2142,7 +2142,7 @@ zyd_tx_mgt(struct zyd_softc *sc, struct
}
m_copydata(m0, 0, m0->m_pkthdr.len,
- data->buf + sizeof (struct zyd_tx_desc));
+ data->buf + sizeof(struct zyd_tx_desc));
DPRINTFN(10, ("%s: sending mgt frame len=%zu rate=%u xferlen=%u\n",
device_xname(sc->sc_dev), (size_t)m0->m_pkthdr.len, rate, xferlen));
@@ -2240,7 +2240,7 @@ zyd_tx_data(struct zyd_softc *sc, struct
data->ni = ni;
- xferlen = sizeof (struct zyd_tx_desc) + m0->m_pkthdr.len;
+ xferlen = sizeof(struct zyd_tx_desc) + m0->m_pkthdr.len;
totlen = m0->m_pkthdr.len + IEEE80211_CRC_LEN;
/* fill Tx descriptor */
@@ -2275,7 +2275,7 @@ zyd_tx_data(struct zyd_softc *sc, struct
desc->phy |= ZYD_TX_PHY_SHPREAMBLE;
/* actual transmit length (XXX why +10?) */
- pktlen = sizeof (struct zyd_tx_desc) + 10;
+ pktlen = sizeof(struct zyd_tx_desc) + 10;
if (sc->mac_rev == ZYD_ZD1211)
pktlen += totlen;
desc->pktlen = htole16(pktlen);
@@ -2300,7 +2300,7 @@ zyd_tx_data(struct zyd_softc *sc, struct
}
m_copydata(m0, 0, m0->m_pkthdr.len,
- data->buf + sizeof (struct zyd_tx_desc));
+ data->buf + sizeof(struct zyd_tx_desc));
DPRINTFN(10, ("%s: sending data frame len=%zu rate=%u xferlen=%u\n",
device_xname(sc->sc_dev), (size_t)m0->m_pkthdr.len, rate, xferlen));
@@ -2617,7 +2617,7 @@ zyd_loadfirmware(struct zyd_softc *sc, u
req.bRequest = ZYD_DOWNLOADSTS;
USETW(req.wValue, 0);
USETW(req.wIndex, 0);
- USETW(req.wLength, sizeof stat);
+ USETW(req.wLength, sizeof(stat));
if (usbd_do_request(sc->sc_udev, &req, &stat) != 0)
return EIO;
Index: src/sys/dev/usb/if_zydreg.h
diff -u src/sys/dev/usb/if_zydreg.h:1.7.16.2 src/sys/dev/usb/if_zydreg.h:1.7.16.3
--- src/sys/dev/usb/if_zydreg.h:1.7.16.2 Thu Mar 19 17:26:43 2015
+++ src/sys/dev/usb/if_zydreg.h Tue Sep 29 11:38:28 2015
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $ */
-/* $NetBSD: if_zydreg.h,v 1.7.16.2 2015/03/19 17:26:43 skrll Exp $ */
+/* $NetBSD: if_zydreg.h,v 1.7.16.3 2015/09/29 11:38:28 skrll Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <[email protected]>
@@ -1084,14 +1084,14 @@ struct zyd_notif_retry {
#define ZYD_TX_TIMEOUT 10000
#define ZYD_MAX_TXBUFSZ \
- (sizeof (struct zyd_tx_desc) + MCLBYTES)
+ (sizeof(struct zyd_tx_desc) + MCLBYTES)
#define ZYD_MIN_FRAGSZ \
- (sizeof (struct zyd_plcphdr) + IEEE80211_MIN_LEN + \
- sizeof (struct zyd_rx_stat))
+ (sizeof(struct zyd_plcphdr) + IEEE80211_MIN_LEN + \
+ sizeof(struct zyd_rx_stat))
#define ZYD_MIN_RXBUFSZ ZYD_MIN_FRAGSZ
#define ZYX_MAX_RXBUFSZ \
- (sizeof (struct zyd_plcphdr) + MCLBYTES + sizeof (struct zyd_rx_desc))
+ (sizeof(struct zyd_plcphdr) + MCLBYTES + sizeof(struct zyd_rx_desc))
#define ZYD_CMD_FLAG_READ (1 << 0)
Index: src/sys/dev/usb/uatp.c
diff -u src/sys/dev/usb/uatp.c:1.10.4.5 src/sys/dev/usb/uatp.c:1.10.4.6
--- src/sys/dev/usb/uatp.c:1.10.4.5 Mon Sep 28 16:24:19 2015
+++ src/sys/dev/usb/uatp.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uatp.c,v 1.10.4.5 2015/09/28 16:24:19 skrll Exp $ */
+/* $NetBSD: uatp.c,v 1.10.4.6 2015/09/29 11:38:29 skrll Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -146,7 +146,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.10.4.5 2015/09/28 16:24:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uatp.c,v 1.10.4.6 2015/09/29 11:38:29 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1823,8 +1823,8 @@ interpret_dimension(struct uatp_softc *s
*/
n_fingers = 0;
- memset(weighted, 0, sizeof weighted);
- memset(total, 0, sizeof total);
+ memset(weighted, 0, sizeof(weighted));
+ memset(total, 0, sizeof(total));
for (i = 0; i < n_sensors; i++) {
CHECK_(0 <= acc[i]);
@@ -1990,7 +1990,7 @@ tap_debug(struct uatp_softc *sc, const c
case TAP_STATE_DRAGGING_UP: state = "dragging-up"; break;
case TAP_STATE_TAPPING_IN_DRAG: state = "tapping-in-drag"; break;
default:
- snprintf(buffer, sizeof buffer, "unknown (%d)",
+ snprintf(buffer, sizeof(buffer), "unknown (%d)",
sc->sc_tap_state);
state = buffer;
break;
Index: src/sys/dev/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.140.2.9 src/sys/dev/usb/uaudio.c:1.140.2.10
--- src/sys/dev/usb/uaudio.c:1.140.2.9 Sat May 9 09:35:20 2015
+++ src/sys/dev/usb/uaudio.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.140.2.9 2015/05/09 09:35:20 skrll Exp $ */
+/* $NetBSD: uaudio.c,v 1.140.2.10 2015/09/29 11:38:29 skrll Exp $ */
/*
* Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.140.2.9 2015/05/09 09:35:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.140.2.10 2015/09/29 11:38:29 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -744,7 +744,7 @@ uaudio_get_cluster(int id, const struct
}
bad:
aprint_error("uaudio_get_cluster: bad data\n");
- memset(&r, 0, sizeof r);
+ memset(&r, 0, sizeof(r));
return r;
}
@@ -1917,7 +1917,7 @@ uaudio_identify_ac(struct uaudio_softc *
id = uaudio_find_iface(tbuf, size, &offs, UISUBCLASS_AUDIOCONTROL);
if (id == NULL)
return USBD_INVAL;
- if (offs + sizeof *acdp > size)
+ if (offs + sizeof(*acdp) > size)
return USBD_INVAL;
sc->sc_ac_iface = id->bInterfaceNumber;
DPRINTFN(2,"AC interface is %d\n", sc->sc_ac_iface);
Index: src/sys/dev/usb/uchcom.c
diff -u src/sys/dev/usb/uchcom.c:1.13.6.5 src/sys/dev/usb/uchcom.c:1.13.6.6
--- src/sys/dev/usb/uchcom.c:1.13.6.5 Tue Sep 29 09:48:20 2015
+++ src/sys/dev/usb/uchcom.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uchcom.c,v 1.13.6.5 2015/09/29 09:48:20 skrll Exp $ */
+/* $NetBSD: uchcom.c,v 1.13.6.6 2015/09/29 11:38:29 skrll Exp $ */
/*
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13.6.5 2015/09/29 09:48:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13.6.6 2015/09/29 11:38:29 skrll Exp $");
/*
* driver for WinChipHead CH341/340, the worst USB-serial chip in the world.
@@ -505,7 +505,7 @@ read_reg(struct uchcom_softc *sc,
err = generic_control_in(
sc, UCHCOM_REQ_READ_REG,
- reg1|((uint16_t)reg2<<8), 0, buf, sizeof buf, &actin);
+ reg1|((uint16_t)reg2<<8), 0, buf, sizeof(buf), &actin);
if (err)
return err;
@@ -527,7 +527,7 @@ get_version(struct uchcom_softc *sc, uin
int actin;
err = generic_control_in(
- sc, UCHCOM_REQ_GET_VERSION, 0, 0, buf, sizeof buf, &actin);
+ sc, UCHCOM_REQ_GET_VERSION, 0, 0, buf, sizeof(buf), &actin);
if (err)
return err;
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.264.4.34 src/sys/dev/usb/uhci.c:1.264.4.35
--- src/sys/dev/usb/uhci.c:1.264.4.34 Tue Sep 22 12:06:01 2015
+++ src/sys/dev/usb/uhci.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.264.4.34 2015/09/22 12:06:01 skrll Exp $ */
+/* $NetBSD: uhci.c,v 1.264.4.35 2015/09/29 11:38:29 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.34 2015/09/22 12:06:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.35 2015/09/29 11:38:29 skrll Exp $");
#include "opt_usb.h"
@@ -2522,14 +2522,14 @@ uhci_device_request(struct usbd_xfer *xf
}
upipe->ctrl.length = len;
- memcpy(KERNADDR(&upipe->ctrl.reqdma, 0), req, sizeof *req);
- usb_syncmem(&upipe->ctrl.reqdma, 0, sizeof *req, BUS_DMASYNC_PREWRITE);
+ memcpy(KERNADDR(&upipe->ctrl.reqdma, 0), req, sizeof(*req));
+ usb_syncmem(&upipe->ctrl.reqdma, 0, sizeof(*req), BUS_DMASYNC_PREWRITE);
setup->link.std = next;
setup->td.td_link = htole32(next->physaddr | UHCI_PTR_TD);
setup->td.td_status = htole32(UHCI_TD_SET_ERRCNT(3) | ls |
UHCI_TD_ACTIVE);
- setup->td.td_token = htole32(UHCI_TD_SETUP(sizeof *req, endpt, addr));
+ setup->td.td_token = htole32(UHCI_TD_SETUP(sizeof(*req), endpt, addr));
setup->td.td_buffer = htole32(DMAADDR(&upipe->ctrl.reqdma, 0));
usb_syncmem(&setup->dma, setup->offs, sizeof(setup->td),
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
@@ -2885,7 +2885,7 @@ uhci_device_isoc_close(struct usbd_pipe
uhci_free_std(sc, std);
}
- kmem_free(isoc->stds, UHCI_VFRAMELIST_COUNT * sizeof (uhci_soft_td_t *));
+ kmem_free(isoc->stds, UHCI_VFRAMELIST_COUNT * sizeof(uhci_soft_td_t *));
}
usbd_status
@@ -2904,7 +2904,7 @@ uhci_setup_isoc(struct usbd_pipe *pipe)
isoc = &upipe->isoc;
isoc->stds = kmem_alloc(UHCI_VFRAMELIST_COUNT *
- sizeof (uhci_soft_td_t *),
+ sizeof(uhci_soft_td_t *),
KM_SLEEP);
if (isoc->stds == NULL)
return USBD_NOMEM;
@@ -2958,7 +2958,7 @@ uhci_setup_isoc(struct usbd_pipe *pipe)
while (--i >= 0)
uhci_free_std(sc, isoc->stds[i]);
mutex_exit(&sc->sc_lock);
- kmem_free(isoc->stds, UHCI_VFRAMELIST_COUNT * sizeof (uhci_soft_td_t *));
+ kmem_free(isoc->stds, UHCI_VFRAMELIST_COUNT * sizeof(uhci_soft_td_t *));
return USBD_NOMEM;
}
Index: src/sys/dev/usb/uhcivar.h
diff -u src/sys/dev/usb/uhcivar.h:1.52.14.6 src/sys/dev/usb/uhcivar.h:1.52.14.7
--- src/sys/dev/usb/uhcivar.h:1.52.14.6 Sat Apr 4 06:19:02 2015
+++ src/sys/dev/usb/uhcivar.h Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhcivar.h,v 1.52.14.6 2015/04/04 06:19:02 skrll Exp $ */
+/* $NetBSD: uhcivar.h,v 1.52.14.7 2015/09/29 11:38:29 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ struct uhci_soft_td {
* aligned.
* NOTE: Minimum size is 32 bytes.
*/
-#define UHCI_STD_SIZE ((sizeof (struct uhci_soft_td) + UHCI_TD_ALIGN - 1) / UHCI_TD_ALIGN * UHCI_TD_ALIGN)
+#define UHCI_STD_SIZE ((sizeof(struct uhci_soft_td) + UHCI_TD_ALIGN - 1) / UHCI_TD_ALIGN * UHCI_TD_ALIGN)
#define UHCI_STD_CHUNK 128 /*(PAGE_SIZE / UHCI_TD_SIZE)*/
/*
@@ -116,7 +116,7 @@ struct uhci_soft_qh {
int offs; /* QH's offset in usb_dma_t */
};
/* See comment about UHCI_STD_SIZE. */
-#define UHCI_SQH_SIZE ((sizeof (struct uhci_soft_qh) + UHCI_QH_ALIGN - 1) / UHCI_QH_ALIGN * UHCI_QH_ALIGN)
+#define UHCI_SQH_SIZE ((sizeof(struct uhci_soft_qh) + UHCI_QH_ALIGN - 1) / UHCI_QH_ALIGN * UHCI_QH_ALIGN)
#define UHCI_SQH_CHUNK 128 /*(PAGE_SIZE / UHCI_QH_SIZE)*/
/*
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.92.4.6 src/sys/dev/usb/uhid.c:1.92.4.7
--- src/sys/dev/usb/uhid.c:1.92.4.6 Mon Apr 6 15:18:13 2015
+++ src/sys/dev/usb/uhid.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.92.4.6 2015/04/06 15:18:13 skrll Exp $ */
+/* $NetBSD: uhid.c,v 1.92.4.7 2015/09/29 11:38:29 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.6 2015/04/06 15:18:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.92.4.7 2015/09/29 11:38:29 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -572,7 +572,7 @@ uhid_do_ioctl(struct uhid_softc *sc, u_l
case USB_GET_REPORT_DESC:
uhidev_get_report_desc(sc->sc_hdev.sc_parent, &desc, &size);
rd = (struct usb_ctl_report_desc *)addr;
- size = min(size, sizeof rd->ucrd_data);
+ size = min(size, sizeof(rd->ucrd_data));
rd->ucrd_size = size;
memcpy(rd->ucrd_data, desc, size);
break;
Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.61.4.8 src/sys/dev/usb/uhidev.c:1.61.4.9
--- src/sys/dev/usb/uhidev.c:1.61.4.8 Sat Jun 6 14:40:14 2015
+++ src/sys/dev/usb/uhidev.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.61.4.8 2015/06/06 14:40:14 skrll Exp $ */
+/* $NetBSD: uhidev.c,v 1.61.4.9 2015/09/29 11:38:29 skrll Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.61.4.8 2015/06/06 14:40:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.61.4.9 2015/09/29 11:38:29 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -217,9 +217,9 @@ uhidev_attach(device_t parent, device_t
* returning digitizer data.
*/
usbd_set_report(uiaa->uiaa_iface, UHID_FEATURE_REPORT, 2,
- &reportbuf, sizeof reportbuf);
+ &reportbuf, sizeof(reportbuf));
- size = sizeof uhid_graphire3_4x5_report_descr;
+ size = sizeof(uhid_graphire3_4x5_report_descr);
descptr = uhid_graphire3_4x5_report_descr;
break;
default:
@@ -228,12 +228,12 @@ uhidev_attach(device_t parent, device_t
}
}
if (USBIF_IS_XINPUT(uiaa)) {
- size = sizeof uhid_xinput_report_descr;
+ size = sizeof(uhid_xinput_report_descr);
descptr = uhid_xinput_report_descr;
}
if (USBIF_IS_X1INPUT(uiaa)) {
sc->sc_flags |= UHIDEV_F_XB1;
- size = sizeof uhid_x1input_report_descr;
+ size = sizeof(uhid_x1input_report_descr);
descptr = uhid_x1input_report_descr;
}
@@ -265,7 +265,7 @@ uhidev_attach(device_t parent, device_t
*/
usbd_set_report(uiaa->uiaa_iface, UHID_FEATURE_REPORT, 0,
- &reportbuf, sizeof reportbuf);
+ &reportbuf, sizeof(reportbuf));
}
if (uiaa->uiaa_vendor == USB_VENDOR_LOGITECH &&
@@ -296,7 +296,7 @@ uhidev_attach(device_t parent, device_t
req.bRequest = 1;
USETW(req.wValue, 0x3f2);
USETW(req.wIndex, 0);
- USETW(req.wLength, sizeof data);
+ USETW(req.wLength, sizeof(data));
usbd_do_request_flags(sc->sc_udev, &req, data,
USBD_SHORT_XFER_OK, &actlen, USBD_DEFAULT_TIMEOUT);
Index: src/sys/dev/usb/uhub.c
diff -u src/sys/dev/usb/uhub.c:1.126.2.14 src/sys/dev/usb/uhub.c:1.126.2.15
--- src/sys/dev/usb/uhub.c:1.126.2.14 Wed Sep 23 13:49:59 2015
+++ src/sys/dev/usb/uhub.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.126.2.14 2015/09/23 13:49:59 skrll Exp $ */
+/* $NetBSD: uhub.c,v 1.126.2.15 2015/09/29 11:38:29 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.14 2015/09/23 13:49:59 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.126.2.15 2015/09/29 11:38:29 skrll Exp $");
#include <sys/param.h>
@@ -412,7 +412,7 @@ uhub_attach(device_t parent, device_t se
#if 0
if (UHUB_IS_HIGH_SPEED(sc) && nports > 0) {
tts = kmem_alloc((UHUB_IS_SINGLE_TT(sc) ? 1 : nports) *
- sizeof (struct usbd_tt), KM_SLEEP);
+ sizeof(struct usbd_tt), KM_SLEEP);
if (!tts)
goto bad;
}
@@ -824,7 +824,7 @@ uhub_detach(device_t self, int flags)
if (hub->ports[0].tt)
kmem_free(hub->ports[0].tt,
(UHUB_IS_SINGLE_TT(sc) ? 1 : nports) *
- sizeof (struct usbd_tt));
+ sizeof(struct usbd_tt));
#endif
kmem_free(hub,
sizeof(*hub) + (nports-1) * sizeof(struct usbd_port));
Index: src/sys/dev/usb/ukyopon.c
diff -u src/sys/dev/usb/ukyopon.c:1.16.16.4 src/sys/dev/usb/ukyopon.c:1.16.16.5
--- src/sys/dev/usb/ukyopon.c:1.16.16.4 Sat Mar 21 11:33:37 2015
+++ src/sys/dev/usb/ukyopon.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ukyopon.c,v 1.16.16.4 2015/03/21 11:33:37 skrll Exp $ */
+/* $NetBSD: ukyopon.c,v 1.16.16.5 2015/09/29 11:38:29 skrll Exp $ */
/*
* Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.16.16.4 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.16.16.5 2015/09/29 11:38:29 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,7 +160,7 @@ ukyopon_ioctl(void *addr, int portno, u_
switch (cmd) {
case UKYOPON_IDENTIFY:
- strncpy(arg_id->ui_name, UKYOPON_NAME, sizeof arg_id->ui_name);
+ strncpy(arg_id->ui_name, UKYOPON_NAME, sizeof(arg_id->ui_name));
arg_id->ui_busno =
device_unit(sc->sc_umodem.sc_udev->ud_bus->ub_usbctl);
arg_id->ui_address = sc->sc_umodem.sc_udev->ud_addr;
Index: src/sys/dev/usb/umass_isdata.c
diff -u src/sys/dev/usb/umass_isdata.c:1.30.2.4 src/sys/dev/usb/umass_isdata.c:1.30.2.5
--- src/sys/dev/usb/umass_isdata.c:1.30.2.4 Mon Apr 6 15:18:13 2015
+++ src/sys/dev/usb/umass_isdata.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_isdata.c,v 1.30.2.4 2015/04/06 15:18:13 skrll Exp $ */
+/* $NetBSD: umass_isdata.c,v 1.30.2.5 2015/09/29 11:38:29 skrll Exp $ */
/*
* TODO:
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.30.2.4 2015/04/06 15:18:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.30.2.5 2015/09/29 11:38:29 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -184,7 +184,7 @@ umass_isdata_attach(struct umass_softc *
struct uisdata_softc *scbus;
struct isd200_config *cf;
- scbus = malloc(sizeof *scbus, M_DEVBUF, M_WAITOK | M_ZERO);
+ scbus = malloc(sizeof(*scbus), M_DEVBUF, M_WAITOK | M_ZERO);
sc->bus = &scbus->base;
cf = &scbus->sc_isd_config;
@@ -192,7 +192,7 @@ umass_isdata_attach(struct umass_softc *
req.bRequest = 0x02;
USETW(req.wValue, 0);
USETW(req.wIndex, 2);
- USETW(req.wLength, sizeof *cf);
+ USETW(req.wLength, sizeof(*cf));
err = usbd_do_request(sc->sc_udev, &req, cf);
if (err) {
@@ -325,7 +325,7 @@ uisdata_bio1(struct ata_drive_datas *drv
ata_bio->nblks = nblks;
ata_bio->nbytes = nbytes;
- memset(&ata, 0, sizeof ata);
+ memset(&ata, 0, sizeof(ata));
ata.ac_signature0 = cf->ATAMajorCommand;
ata.ac_signature1 = cf->ATAMinorCommand;
ata.ac_transfer_blocksize = 1;
@@ -358,7 +358,7 @@ uisdata_bio1(struct ata_drive_datas *drv
ata.ac_sector_count, ata_bio->multi));
DPRINTF((" data=%p bcount=%ld, drive=%d\n", ata_bio->databuf,
ata_bio->bcount, drv->drive));
- sc->sc_methods->wire_xfer(sc, drv->drive, &ata, sizeof ata,
+ sc->sc_methods->wire_xfer(sc, drv->drive, &ata, sizeof(ata),
ata_bio->databuf + scbus->sc_skip, nbytes,
dir, ATA_DELAY, 0, uisdata_bio_cb, ata_bio);
@@ -434,7 +434,7 @@ uisdata_exec_command(struct ata_drive_da
goto done;
}
- memset(&ata, 0, sizeof ata);
+ memset(&ata, 0, sizeof(ata));
ata.ac_signature0 = cf->ATAMajorCommand;
ata.ac_signature1 = cf->ATAMinorCommand;
ata.ac_transfer_blocksize = 1;
@@ -454,7 +454,7 @@ uisdata_exec_command(struct ata_drive_da
DPRINTF(("%s: execute ATA command 0x%02x, drive=%d\n", __func__,
ata.ac_command, drv->drive));
sc->sc_methods->wire_xfer(sc, drv->drive, &ata,
- sizeof ata, cmd->data, cmd->bcount, dir,
+ sizeof(ata), cmd->data, cmd->bcount, dir,
cmd->timeout, 0, uisdata_exec_cb, cmd);
if (cmd->flags & (AT_POLL | AT_WAIT)) {
#if 0
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.49.2.2 src/sys/dev/usb/umass_scsipi.c:1.49.2.3
--- src/sys/dev/usb/umass_scsipi.c:1.49.2.2 Tue Dec 23 11:24:32 2014
+++ src/sys/dev/usb/umass_scsipi.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.49.2.2 2014/12/23 11:24:32 skrll Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.49.2.3 2015/09/29 11:38:29 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.2.2 2014/12/23 11:24:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.49.2.3 2015/09/29 11:38:29 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -179,7 +179,7 @@ umass_scsipi_setup(struct umass_softc *s
{
struct umass_scsipi_softc *scbus;
- scbus = malloc(sizeof *scbus, M_DEVBUF, M_WAITOK | M_ZERO);
+ scbus = malloc(sizeof(*scbus), M_DEVBUF, M_WAITOK | M_ZERO);
sc->bus = &scbus->base;
/* Only use big commands for USB SCSI devices. */
Index: src/sys/dev/usb/umcs.c
diff -u src/sys/dev/usb/umcs.c:1.8.2.4 src/sys/dev/usb/umcs.c:1.8.2.5
--- src/sys/dev/usb/umcs.c:1.8.2.4 Sat Mar 21 11:33:37 2015
+++ src/sys/dev/usb/umcs.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: umcs.c,v 1.8.2.4 2015/03/21 11:33:37 skrll Exp $ */
+/* $NetBSD: umcs.c,v 1.8.2.5 2015/09/29 11:38:29 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.2.4 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umcs.c,v 1.8.2.5 2015/09/29 11:38:29 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -285,7 +285,7 @@ umcs7840_attach(device_t parent, device_
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
sc->sc_dev);
- memset(&uca, 0, sizeof uca);
+ memset(&uca, 0, sizeof(uca));
uca.ibufsize = 256;
uca.obufsize = 256;
uca.ibufsizepad = 256;
Index: src/sys/dev/usb/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.65.14.6 src/sys/dev/usb/umidi.c:1.65.14.7
--- src/sys/dev/usb/umidi.c:1.65.14.6 Mon Apr 6 15:18:13 2015
+++ src/sys/dev/usb/umidi.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.65.14.6 2015/04/06 15:18:13 skrll Exp $ */
+/* $NetBSD: umidi.c,v 1.65.14.7 2015/09/29 11:38:29 skrll Exp $ */
/*
* Copyright (c) 2001, 2012, 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.65.14.6 2015/04/06 15:18:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.65.14.7 2015/09/29 11:38:29 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1289,7 +1289,7 @@ open_out_jack(struct umidi_jack *jack, v
jack->arg = arg;
jack->u.out.intr = intr;
jack->midiman_ppkt = NULL;
- end = ep->buffer + ep->buffer_size / sizeof *ep->buffer;
+ end = ep->buffer + ep->buffer_size / sizeof(*ep->buffer);
jack->opened = 1;
ep->num_open++;
/*
@@ -1554,19 +1554,19 @@ describe_mididev(struct umidi_mididev *m
if (NULL == md->in_jack)
in_label[0] = '\0';
else if (show_ep_in)
- snprintf(in_label, sizeof in_label, "<%d(%x) ",
+ snprintf(in_label, sizeof(in_label), "<%d(%x) ",
md->in_jack->cable_number, md->in_jack->endpoint->addr);
else
- snprintf(in_label, sizeof in_label, "<%d ",
+ snprintf(in_label, sizeof(in_label), "<%d ",
md->in_jack->cable_number);
if (NULL == md->out_jack)
out_label[0] = '\0';
else if (show_ep_out)
- snprintf(out_label, sizeof out_label, ">%d(%x) ",
+ snprintf(out_label, sizeof(out_label), ">%d(%x) ",
md->out_jack->cable_number, md->out_jack->endpoint->addr);
else
- snprintf(out_label, sizeof out_label, ">%d ",
+ snprintf(out_label, sizeof(out_label), ">%d ",
md->out_jack->cable_number);
unit_label = device_xname(sc->sc_dev);
@@ -1668,7 +1668,7 @@ start_output_transfer(struct umidi_endpo
uint32_t length;
int i;
- length = (ep->next_slot - ep->buffer) * sizeof *ep->buffer;
+ length = (ep->next_slot - ep->buffer) * sizeof(*ep->buffer);
DPRINTFN(200,("umidi out transfer: start %p end %p length %u\n",
ep->buffer, ep->next_slot, length));
usbd_setup_xfer(ep->xfer, ep->pipe,
@@ -1751,7 +1751,7 @@ out_jack_output(struct umidi_jack *out_j
packet = *ep->next_slot++;
KASSERT(ep->buffer_size >=
- (ep->next_slot - ep->buffer) * sizeof *ep->buffer);
+ (ep->next_slot - ep->buffer) * sizeof(*ep->buffer));
memset(packet, 0, UMIDI_PACKET_SIZE);
if (UMQ_ISTYPE(sc, UMQ_TYPE_MIDIMAN_GARBLE)) {
if (NULL != out_jack->midiman_ppkt) { /* fill out a prev pkt */
@@ -1831,7 +1831,7 @@ in_intr(struct usbd_xfer *xfer, void *pr
}
slot = ep->buffer;
- end = slot + count / sizeof *slot;
+ end = slot + count / sizeof(*slot);
for (packet = *slot; slot < end; packet = *++slot) {
@@ -1954,7 +1954,7 @@ out_solicit_locked(void *arg)
KASSERT(mutex_owned(&ep->sc->sc_lock));
- end = ep->buffer + ep->buffer_size / sizeof *ep->buffer;
+ end = ep->buffer + ep->buffer_size / sizeof(*ep->buffer);
for ( ;; ) {
if (end - ep->next_slot <= ep->num_open - ep->num_scheduled)
Index: src/sys/dev/usb/usb.c
diff -u src/sys/dev/usb/usb.c:1.156.2.9 src/sys/dev/usb/usb.c:1.156.2.10
--- src/sys/dev/usb/usb.c:1.156.2.9 Sat Jun 6 14:40:14 2015
+++ src/sys/dev/usb/usb.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.156.2.9 2015/06/06 14:40:14 skrll Exp $ */
+/* $NetBSD: usb.c,v 1.156.2.10 2015/09/29 11:38:29 skrll Exp $ */
/*
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.156.2.9 2015/06/06 14:40:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.156.2.10 2015/09/29 11:38:29 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -634,10 +634,10 @@ usbread(dev_t dev, struct uio *uio, int
;
}
- error = uiomove((void *)ueo, sizeof *ueo, uio);
+ error = uiomove((void *)ueo, sizeof(*ueo), uio);
} else
#endif
- error = uiomove((void *)ue, sizeof *ue, uio);
+ error = uiomove((void *)ue, sizeof(*ue), uio);
}
usb_free_event(ue);
#ifdef COMPAT_30
@@ -971,7 +971,7 @@ usbd_add_drv_event(int type, struct usbd
ue->u.ue_driver.ue_cookie = udev->ud_cookie;
strncpy(ue->u.ue_driver.ue_devname, device_xname(dev),
- sizeof ue->u.ue_driver.ue_devname);
+ sizeof(ue->u.ue_driver.ue_devname));
usb_add_event(type, ue);
}
Index: src/sys/dev/usb/usb_mem.c
diff -u src/sys/dev/usb/usb_mem.c:1.65.2.9 src/sys/dev/usb/usb_mem.c:1.65.2.10
--- src/sys/dev/usb/usb_mem.c:1.65.2.9 Sat Mar 21 15:30:11 2015
+++ src/sys/dev/usb/usb_mem.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.65.2.9 2015/03/21 15:30:11 skrll Exp $ */
+/* $NetBSD: usb_mem.c,v 1.65.2.10 2015/09/29 11:38:29 skrll Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.65.2.9 2015/03/21 15:30:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.65.2.10 2015/09/29 11:38:29 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -137,7 +137,7 @@ usb_block_allocmem(bus_dma_tag_t tag, si
}
DPRINTFN(6, "no free", 0, 0, 0, 0);
- b = kmem_zalloc(sizeof *b, KM_SLEEP);
+ b = kmem_zalloc(sizeof(*b), KM_SLEEP);
if (b == NULL)
return USBD_NOMEM;
@@ -153,7 +153,7 @@ usb_block_allocmem(bus_dma_tag_t tag, si
b->segs = kmem_alloc(b->nsegs * sizeof(*b->segs), KM_SLEEP);
if (b->segs == NULL) {
- kmem_free(b, sizeof *b);
+ kmem_free(b, sizeof(*b));
return USBD_NOMEM;
}
b->nsegs_alloc = b->nsegs;
@@ -194,7 +194,7 @@ usb_block_allocmem(bus_dma_tag_t tag, si
bus_dmamem_free(tag, b->segs, b->nsegs);
free0:
kmem_free(b->segs, b->nsegs_alloc * sizeof(*b->segs));
- kmem_free(b, sizeof *b);
+ kmem_free(b, sizeof(*b));
return USBD_NOMEM;
}
@@ -213,7 +213,7 @@ usb_block_real_freemem(usb_dma_block_t *
bus_dmamem_unmap(b->tag, b->kaddr, b->size);
bus_dmamem_free(b->tag, b->segs, b->nsegs);
kmem_free(b->segs, b->nsegs_alloc * sizeof(*b->segs));
- kmem_free(b, sizeof *b);
+ kmem_free(b, sizeof(*b));
}
#endif
Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.198.2.17 src/sys/dev/usb/usb_subr.c:1.198.2.18
--- src/sys/dev/usb/usb_subr.c:1.198.2.17 Tue Sep 22 12:06:01 2015
+++ src/sys/dev/usb/usb_subr.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.198.2.17 2015/09/22 12:06:01 skrll Exp $ */
+/* $NetBSD: usb_subr.c,v 1.198.2.18 2015/09/29 11:38:29 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.17 2015/09/22 12:06:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_subr.c,v 1.198.2.18 2015/09/29 11:38:29 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -110,7 +110,7 @@ usbd_errstr(usbd_status err)
if (err < USBD_ERROR_MAX) {
return usbd_error_strs[err];
} else {
- snprintf(buffer, sizeof buffer, "%d", err);
+ snprintf(buffer, sizeof(buffer), "%d", err);
return buffer;
}
}
Index: src/sys/dev/usb/usbdi.h
diff -u src/sys/dev/usb/usbdi.h:1.90.4.6 src/sys/dev/usb/usbdi.h:1.90.4.7
--- src/sys/dev/usb/usbdi.h:1.90.4.6 Sat Sep 19 07:45:38 2015
+++ src/sys/dev/usb/usbdi.h Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.h,v 1.90.4.6 2015/09/19 07:45:38 skrll Exp $ */
+/* $NetBSD: usbdi.h,v 1.90.4.7 2015/09/29 11:38:29 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -219,7 +219,7 @@ struct usb_devno {
const struct usb_devno *usb_match_device(const struct usb_devno *,
u_int, u_int, uint16_t, uint16_t);
#define usb_lookup(tbl, vendor, product) \
- usb_match_device((const struct usb_devno *)(tbl), sizeof (tbl) / sizeof ((tbl)[0]), sizeof ((tbl)[0]), (vendor), (product))
+ usb_match_device((const struct usb_devno *)(tbl), sizeof(tbl) / sizeof((tbl)[0]), sizeof((tbl)[0]), (vendor), (product))
#define USB_PRODUCT_ANY 0xffff
/* NetBSD attachment information */
Index: src/sys/dev/usb/usbdi_util.c
diff -u src/sys/dev/usb/usbdi_util.c:1.63.2.10 src/sys/dev/usb/usbdi_util.c:1.63.2.11
--- src/sys/dev/usb/usbdi_util.c:1.63.2.10 Sun Jun 7 08:04:36 2015
+++ src/sys/dev/usb/usbdi_util.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.c,v 1.63.2.10 2015/06/07 08:04:36 skrll Exp $ */
+/* $NetBSD: usbdi_util.c,v 1.63.2.11 2015/09/29 11:38:29 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.63.2.10 2015/06/07 08:04:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.63.2.11 2015/09/29 11:38:29 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -186,7 +186,7 @@ usbd_get_port_status(struct usbd_device
req.bRequest = UR_GET_STATUS;
USETW(req.wValue, 0);
USETW(req.wIndex, port);
- USETW(req.wLength, sizeof *ps);
+ USETW(req.wLength, sizeof(*ps));
return usbd_do_request(dev, &req, ps);
}
@@ -201,7 +201,7 @@ usbd_get_port_status_ext(struct usbd_dev
req.bRequest = UR_GET_STATUS;
USETW2(req.wValue, 0, UR_PST_EXT_PORT_STATUS);
USETW(req.wIndex, port);
- USETW(req.wLength, sizeof *pse);
+ USETW(req.wLength, sizeof(*pse));
return (usbd_do_request(dev, &req, pse));
}
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.38.6.8 src/sys/dev/usb/usscanner.c:1.38.6.9
--- src/sys/dev/usb/usscanner.c:1.38.6.8 Sat Mar 21 11:33:37 2015
+++ src/sys/dev/usb/usscanner.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.38.6.8 2015/03/21 11:33:37 skrll Exp $ */
+/* $NetBSD: usscanner.c,v 1.38.6.9 2015/09/29 11:38:29 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.8 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.38.6.9 2015/09/29 11:38:29 skrll Exp $");
#include "scsibus.h"
#include <sys/param.h>
@@ -446,12 +446,12 @@ usscanner_sense(struct usscanner_softc *
memset(&sense_cmd, 0, sizeof(sense_cmd));
sense_cmd.opcode = SCSI_REQUEST_SENSE;
sense_cmd.byte2 = periph->periph_lun << SCSI_CMD_LUN_SHIFT;
- sense_cmd.length = sizeof xs->sense;
+ sense_cmd.length = sizeof(xs->sense);
sc->sc_state = UAS_SENSECMD;
- memcpy(sc->sc_cmd_buffer, &sense_cmd, sizeof sense_cmd);
+ memcpy(sc->sc_cmd_buffer, &sense_cmd, sizeof(sense_cmd));
usbd_setup_xfer(sc->sc_cmd_xfer, sc->sc_out_pipe, sc, sc->sc_cmd_buffer,
- sizeof sense_cmd, 0, USSCANNER_TIMEOUT,
+ sizeof(sense_cmd), 0, USSCANNER_TIMEOUT,
usscanner_sensecmd_cb);
err = usbd_transfer(sc->sc_cmd_xfer);
if (err == USBD_IN_PROGRESS)
@@ -552,7 +552,7 @@ usscanner_sensedata_cb(struct usbd_xfer
switch (status) {
case USBD_NORMAL_COMPLETION:
memcpy(&xs->sense, sc->sc_data_buffer, len);
- if (len < sizeof xs->sense)
+ if (len < sizeof(xs->sense))
xs->error = XS_SHORTSENSE;
break;
case USBD_TIMEOUT:
@@ -621,7 +621,7 @@ usscanner_sensecmd_cb(struct usbd_xfer *
sc->sc_state = UAS_SENSEDATA;
usbd_setup_xfer(sc->sc_data_xfer, sc->sc_in_pipe, sc,
sc->sc_data_buffer,
- sizeof xs->sense, USBD_SHORT_XFER_OK,
+ sizeof(xs->sense), USBD_SHORT_XFER_OK,
USSCANNER_TIMEOUT, usscanner_sensedata_cb);
err = usbd_transfer(sc->sc_data_xfer);
if (err == USBD_IN_PROGRESS)
Index: src/sys/dev/usb/uvisor.c
diff -u src/sys/dev/usb/uvisor.c:1.45.24.5 src/sys/dev/usb/uvisor.c:1.45.24.6
--- src/sys/dev/usb/uvisor.c:1.45.24.5 Sat Mar 21 11:33:37 2015
+++ src/sys/dev/usb/uvisor.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uvisor.c,v 1.45.24.5 2015/03/21 11:33:37 skrll Exp $ */
+/* $NetBSD: uvisor.c,v 1.45.24.6 2015/09/29 11:38:29 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.45.24.5 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.45.24.6 2015/09/29 11:38:29 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -466,7 +466,7 @@ uvisor_init(struct uvisor_softc *sc, str
req.bRequest = UVISOR_REQUEST_BYTES_AVAILABLE;
USETW(req.wValue, 0);
USETW(req.wIndex, 5);
- USETW(req.wLength, sizeof avail);
+ USETW(req.wLength, sizeof(avail));
err = usbd_do_request(sc->sc_udev, &req, &avail);
if (err)
return err;
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.38 src/sys/dev/usb/xhci.c:1.28.2.39
--- src/sys/dev/usb/xhci.c:1.28.2.38 Wed Sep 23 13:44:01 2015
+++ src/sys/dev/usb/xhci.c Tue Sep 29 11:38:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.28.2.38 2015/09/23 13:44:01 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.28.2.39 2015/09/29 11:38:29 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.38 2015/09/23 13:44:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.39 2015/09/29 11:38:29 skrll Exp $");
#include "opt_usb.h"
@@ -702,7 +702,7 @@ xhci_init(struct xhci_softc *sc)
if (hciversion < XHCI_HCIVERSION_1_0)
snprintb(sbuf, sizeof(sbuf), XHCI_HCCPREV1_BITS, hcc);
else
- snprintb(sbuf, sizeof sbuf, XHCI_HCCV1_x_BITS, hcc);
+ snprintb(sbuf, sizeof(sbuf), XHCI_HCCV1_x_BITS, hcc);
aprint_debug_dev(sc->sc_dev, "hcc=%s\n", sbuf);
aprint_debug_dev(sc->sc_dev, "xECP %x\n", XHCI_HCC_XECP(hcc) * 4);
