diff options
| author | tsutsui <tsutsui@NetBSD.org> | 2009-04-18 14:58:02 +0000 |
|---|---|---|
| committer | tsutsui <tsutsui@NetBSD.org> | 2009-04-18 14:58:02 +0000 |
| commit | d779b85d3e27cbc6415031c4446bef314272b7be (patch) | |
| tree | 5836c2c63744b89d48a9207fb26e15108d8346bb /sys/dev | |
| parent | 86340eaa2bc29d659f84a5fcd4ec8e1c545a7e3b (diff) | |
Remove extra whitespace added by a stupid tool.
XXX: more in src/sys/arch
Diffstat (limited to 'sys/dev')
33 files changed, 200 insertions, 200 deletions
diff --git a/sys/dev/eisa/ahb.c b/sys/dev/eisa/ahb.c index c55bbb2be02..a29896ae981 100644 --- a/sys/dev/eisa/ahb.c +++ b/sys/dev/eisa/ahb.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahb.c,v 1.53 2009/03/18 17:06:48 cegger Exp $ */ +/* $NetBSD: ahb.c,v 1.54 2009/04/18 14:58:02 tsutsui Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.53 2009/03/18 17:06:48 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.54 2009/04/18 14:58:02 tsutsui Exp $"); #include "opt_ddb.h" @@ -844,7 +844,7 @@ ahb_scsipi_request(struct scsipi_channel *chan, scsipi_adapter_req_t req, ecb->opcode = ECB_SCSI_OP; ecb->opt1 = ECB_SES /*| ECB_DSB*/ | ECB_ARS; ecb->opt2 = periph->periph_lun | ECB_NRB; - memcpy( &ecb->scsi_cmd, xs->cmd, + memcpy(&ecb->scsi_cmd, xs->cmd, ecb->scsi_cmd_length = xs->cmdlen); ecb->sense_ptr = sc->sc_dmamap_ecb->dm_segs[0].ds_addr + AHB_ECB_OFF(ecb) + offsetof(struct ahb_ecb, ecb_sense); diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c index 0b3460c5d92..d2d559c5bf9 100644 --- a/sys/dev/eisa/if_fea.c +++ b/sys/dev/eisa/if_fea.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fea.c,v 1.38 2009/03/18 17:06:48 cegger Exp $ */ +/* $NetBSD: if_fea.c,v 1.39 2009/04/18 14:58:02 tsutsui Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.38 2009/03/18 17:06:48 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.39 2009/04/18 14:58:02 tsutsui Exp $"); #include "opt_inet.h" @@ -310,7 +310,7 @@ pdq_eisa_attach( return -1; } - memcpy( sc->sc_ac.ac_enaddr, (void *) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, 6); + memcpy(sc->sc_ac.ac_enaddr, (void *) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, 6); pdq_ifattach(sc, pdq_eisa_ifwatchdog); ed->kdc->kdc_state = DC_BUSY; /* host adapters always busy */ @@ -413,7 +413,7 @@ pdq_eisa_attach( return; } - memcpy( sc->sc_ac.ac_enaddr, (void *) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, 6); + memcpy(sc->sc_ac.ac_enaddr, (void *) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, 6); pdq_ifattach(sc, pdq_eisa_ifwatchdog); diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c index f0ffacb39a1..b98a09b3818 100644 --- a/sys/dev/ic/bwi.c +++ b/sys/dev/ic/bwi.c @@ -1,4 +1,4 @@ -/* $NetBSD: bwi.c,v 1.7 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: bwi.c,v 1.8 2009/04/18 14:58:02 tsutsui Exp $ */ /* $OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $ */ /* @@ -49,7 +49,7 @@ #include "bpfilter.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.7 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.8 2009/04/18 14:58:02 tsutsui Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -1749,10 +1749,10 @@ bwi_mac_init_tpctl_11bg(struct bwi_mac *mac) struct bwi_tpctl tpctl; /* Backup original TX power control variables */ - memcpy( &tpctl_orig, &mac->mac_tpctl, sizeof(tpctl_orig)); + memcpy(&tpctl_orig, &mac->mac_tpctl, sizeof(tpctl_orig)); restore_tpctl = 1; - memcpy( &tpctl, &mac->mac_tpctl, sizeof(tpctl)); + memcpy(&tpctl, &mac->mac_tpctl, sizeof(tpctl)); tpctl.bbp_atten = 11; tpctl.tp_ctrl1 = 0; #ifdef notyet @@ -2728,7 +2728,7 @@ bwi_mac_adjust_tpctl(struct bwi_mac *mac, int rf_atten_adj, int bbp_atten_adj) struct bwi_tpctl tpctl; int bbp_atten, rf_atten, tp_ctrl1; - memcpy( &tpctl, &mac->mac_tpctl, sizeof(tpctl)); + memcpy(&tpctl, &mac->mac_tpctl, sizeof(tpctl)); /* NOTE: Use signed value to do calulation */ bbp_atten = tpctl.bbp_atten; @@ -4834,7 +4834,7 @@ bwi_rf_map_txpower(struct bwi_mac *mac) if (sc->sc_bbp_id == BWI_BBPID_BCM4301 && rf->rf_type != BWI_RF_T_BCM2050) { rf->rf_idle_tssi0 = BWI_DEFAULT_IDLE_TSSI; - memcpy( rf->rf_txpower_map0, bwi_txpower_map_11b, + memcpy(rf->rf_txpower_map0, bwi_txpower_map_11b, sizeof(rf->rf_txpower_map0)); goto back; } @@ -4880,7 +4880,7 @@ bwi_rf_map_txpower(struct bwi_mac *mac) } rf->rf_idle_tssi0 = BWI_DEFAULT_IDLE_TSSI; - memcpy( rf->rf_txpower_map0, txpower_map, + memcpy(rf->rf_txpower_map0, txpower_map, sizeof(rf->rf_txpower_map0)); goto back; } @@ -5172,11 +5172,11 @@ _bwi_rf_lo_update_11g(struct bwi_mac *mac, uint16_t orig_rf7a) } else if (init_rf_atten < 0) { lo = bwi_get_rf_lo(mac, rf_atten, 2 * bbp_atten); - memcpy( &lo_save, lo, sizeof(lo_save)); + memcpy(&lo_save, lo, sizeof(lo_save)); } else { lo = bwi_get_rf_lo(mac, init_rf_atten, 0); - memcpy( &lo_save, lo, sizeof(lo_save)); + memcpy(&lo_save, lo, sizeof(lo_save)); } devi_ctrl = 0; @@ -5203,7 +5203,7 @@ _bwi_rf_lo_update_11g(struct bwi_mac *mac, uint16_t orig_rf7a) rf_atten, 2 * bbp_atten); if (!bwi_rf_lo_isused(mac, lo)) continue; - memcpy( &lo_save, lo, sizeof(lo_save)); + memcpy(&lo_save, lo, sizeof(lo_save)); devi_ctrl = 3; adj_rf7a = 0; @@ -5260,7 +5260,7 @@ bwi_rf_lo_measure_11g(struct bwi_mac *mac, const struct bwi_rf_lo *src_lo, uint32_t devi_min; int found, loop_count, adjust_state; - memcpy( &lo_min, src_lo, sizeof(lo_min)); + memcpy(&lo_min, src_lo, sizeof(lo_min)); RF_LO_WRITE(mac, &lo_min); devi_min = bwi_rf_lo_devi_measure(mac, devi_ctrl); @@ -5290,7 +5290,7 @@ bwi_rf_lo_measure_11g(struct bwi_mac *mac, const struct bwi_rf_lo *src_lo, fin -= LO_ADJUST_MAX; KASSERT(fin <= LO_ADJUST_MAX && fin >= LO_ADJUST_MIN); - memcpy( &lo_base, &lo_min, sizeof(lo_base)); + memcpy(&lo_base, &lo_min, sizeof(lo_base)); for (;;) { struct bwi_rf_lo lo; @@ -5308,7 +5308,7 @@ bwi_rf_lo_measure_11g(struct bwi_mac *mac, const struct bwi_rf_lo *src_lo, devi_min = devi; adjust_state = i; found = 1; - memcpy( &lo_min, &lo, sizeof(lo_min)); + memcpy(&lo_min, &lo, sizeof(lo_min)); } } if (i == fin) @@ -5320,7 +5320,7 @@ bwi_rf_lo_measure_11g(struct bwi_mac *mac, const struct bwi_rf_lo *src_lo, } } while (loop_count-- && found); - memcpy( dst_lo, &lo_min, sizeof(*dst_lo)); + memcpy(dst_lo, &lo_min, sizeof(*dst_lo)); #undef LO_ADJUST_MIN #undef LO_ADJUST_MAX @@ -5949,7 +5949,7 @@ bwi_rf_clear_state(struct bwi_rf *rf) rf->rf_lo_gain = 0; rf->rf_rx_gain = 0; - memcpy( rf->rf_txpower_map, rf->rf_txpower_map0, + memcpy(rf->rf_txpower_map, rf->rf_txpower_map0, sizeof(rf->rf_txpower_map)); rf->rf_idle_tssi = rf->rf_idle_tssi0; } @@ -9137,8 +9137,8 @@ bwi_encap(struct bwi_softc *sc, int idx, struct mbuf *m, memset(hdr, 0, sizeof(*hdr)); - memcpy( hdr->txh_fc, wh->i_fc, sizeof(hdr->txh_fc)); - memcpy( hdr->txh_addr1, wh->i_addr1, sizeof(hdr->txh_addr1)); + memcpy(hdr->txh_fc, wh->i_fc, sizeof(hdr->txh_fc)); + memcpy(hdr->txh_addr1, wh->i_addr1, sizeof(hdr->txh_addr1)); if (!mcast_pkt) { uint16_t dur; @@ -9668,8 +9668,8 @@ bwi_set_bssid(struct bwi_softc *sc, const uint8_t *bssid) bwi_set_addr_filter(sc, BWI_ADDR_FILTER_BSSID, bssid); - memcpy( buf.myaddr, ic->ic_myaddr, sizeof(buf.myaddr)); - memcpy( buf.bssid, bssid, sizeof(buf.bssid)); + memcpy(buf.myaddr, ic->ic_myaddr, sizeof(buf.myaddr)); + memcpy(buf.bssid, bssid, sizeof(buf.bssid)); n = sizeof(buf) / sizeof(val); p = (const uint8_t *)&buf; diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c index 0ce792d16bc..41939c087c9 100644 --- a/sys/dev/ic/ciss.c +++ b/sys/dev/ic/ciss.c @@ -1,4 +1,4 @@ -/* $NetBSD: ciss.c,v 1.17 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: ciss.c,v 1.18 2009/04/18 14:58:02 tsutsui Exp $ */ /* $OpenBSD: ciss.c,v 1.14 2006/03/13 16:02:23 mickey Exp $ */ /* @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.17 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.18 2009/04/18 14:58:02 tsutsui Exp $"); #include "bio.h" @@ -667,7 +667,7 @@ ciss_error(struct ciss_ccb *ccb) switch (err->scsi_stat) { case SCSI_CHECK: xs->error = XS_SENSE; - memcpy( &xs->sense, &err->sense[0], + memcpy(&xs->sense, &err->sense[0], sizeof(xs->sense)); CISS_DPRINTF(CISS_D_CMD, (" sense=%02x %02x %02x %02x ", err->sense[0], err->sense[1], err->sense[2], err->sense[3])); @@ -918,7 +918,7 @@ ciss_pdscan(struct ciss_softc *sc, int ld) memset(&ldp->bling, 0, sizeof(ldp->bling)); ldp->ndrives = k; ldp->xname[0] = 0; - memcpy( ldp->tgts, buf, k); + memcpy(ldp->tgts, buf, k); return ldp; } @@ -969,7 +969,7 @@ ciss_scsi_raw_cmd(struct scsipi_channel *chan, scsipi_adapter_req_t req, cmd->flags |= CISS_CDB_OUT; cmd->tmo = xs->timeout < 1000? 1 : xs->timeout / 1000; memset(&cmd->cdb[0], 0, sizeof(cmd->cdb)); - memcpy( &cmd->cdb[0], xs->cmd, CISS_MAX_CDB); + memcpy(&cmd->cdb[0], xs->cmd, CISS_MAX_CDB); if (ciss_cmd(ccb, BUS_DMA_WAITOK, xs->xs_control & (XS_CTL_POLL|XS_CTL_NOSLEEP))) { @@ -1048,7 +1048,7 @@ ciss_scsi_cmd(struct scsipi_channel *chan, scsipi_adapter_req_t req, cmd->flags |= CISS_CDB_OUT; cmd->tmo = xs->timeout < 1000? 1 : xs->timeout / 1000; memset(&cmd->cdb[0], 0, sizeof(cmd->cdb)); - memcpy( &cmd->cdb[0], xs->cmd, CISS_MAX_CDB); + memcpy(&cmd->cdb[0], xs->cmd, CISS_MAX_CDB); CISS_DPRINTF(CISS_D_CMD, ("cmd=%02x %02x %02x %02x %02x %02x ", cmd->cdb[0], cmd->cdb[1], cmd->cdb[2], cmd->cdb[3], cmd->cdb[4], cmd->cdb[5])); @@ -1370,7 +1370,7 @@ ciss_blink(struct ciss_softc *sc, int ld, int pd, int stat, ldp->bling.pdtab[ldp->tgts[pd]] = stat == BIOC_SBUNBLINK? 0 : CISS_BLINK_ALL; - memcpy( blink, &ldp->bling, sizeof(*blink)); + memcpy(blink, &ldp->bling, sizeof(*blink)); ccb = ciss_get_ccb(sc); if (ccb == NULL) diff --git a/sys/dev/ic/mpt.c b/sys/dev/ic/mpt.c index 500dd14d9ec..51066a18d25 100644 --- a/sys/dev/ic/mpt.c +++ b/sys/dev/ic/mpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpt.c,v 1.12 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: mpt.c,v 1.13 2009/04/18 14:58:02 tsutsui Exp $ */ /* * Copyright (c) 2000, 2001 by Greg Ansley @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpt.c,v 1.12 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpt.c,v 1.13 2009/04/18 14:58:02 tsutsui Exp $"); #include <dev/ic/mpt.h> @@ -540,7 +540,7 @@ mpt_read_cfg_header(mpt_softc_t *mpt, int PageType, int PageNumber, mpt_free_reply(mpt, (req->sequence << 1)); return (-1); } - memcpy( rslt, &reply->Header, sizeof (fCONFIG_PAGE_HEADER)); + memcpy(rslt, &reply->Header, sizeof (fCONFIG_PAGE_HEADER)); mpt_free_reply(mpt, (req->sequence << 1)); mpt_free_request(mpt, req); return (0); diff --git a/sys/dev/ic/mpt_debug.c b/sys/dev/ic/mpt_debug.c index 56fbfae4ce9..f548fa1e066 100644 --- a/sys/dev/ic/mpt_debug.c +++ b/sys/dev/ic/mpt_debug.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpt_debug.c,v 1.5 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: mpt_debug.c,v 1.6 2009/04/18 14:58:02 tsutsui Exp $ */ /* * Copyright (c) 2000, 2001 by Greg Ansley @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpt_debug.c,v 1.5 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpt_debug.c,v 1.6 2009/04/18 14:58:02 tsutsui Exp $"); #include <dev/ic/mpt.h> @@ -474,7 +474,7 @@ mpt_print_scsi_io_request(MSG_SCSI_IO_REQUEST *orig_msg) MSG_SCSI_IO_REQUEST local, *msg = &local; int i; - memcpy( msg, orig_msg, sizeof (MSG_SCSI_IO_REQUEST)); + memcpy(msg, orig_msg, sizeof (MSG_SCSI_IO_REQUEST)); mpt_print_request_hdr((MSG_REQUEST_HEADER *)msg); printf("\tBus: %d\n", msg->Bus); printf("\tTargetID %d\n", msg->TargetID); diff --git a/sys/dev/ieee1394/fwcrom.c b/sys/dev/ieee1394/fwcrom.c index 55c939fd528..9f7fa18abcb 100644 --- a/sys/dev/ieee1394/fwcrom.c +++ b/sys/dev/ieee1394/fwcrom.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwcrom.c,v 1.9 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: fwcrom.c,v 1.10 2009/04/18 14:58:02 tsutsui Exp $ */ /*- * Copyright (c) 2002-2003 * Hidetoshi Shimokawa. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwcrom.c,v 1.9 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwcrom.c,v 1.10 2009/04/18 14:58:02 tsutsui Exp $"); #ifdef __FreeBSD__ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/dev/firewire/fwcrom.c,v 1.14 2006/02/04 21:37:39 imp Exp $"); #endif @@ -490,7 +490,7 @@ crom_add_simple_text(struct crom_src *src, struct crom_chunk *parent, tl->spec_type = 0; tl->lang_id = 0; memset(&t[0], 0, roundup2(len, sizeof(uint32_t))); - memcpy( &t[0], buf, len); + memcpy(&t[0], buf, len); p = (uint32_t *)&t[0]; for (i = 0; i < howmany(len, sizeof(uint32_t)); i ++) tl->text[i] = ntohl(*p++); @@ -504,7 +504,7 @@ crom_copy(uint32_t *src, uint32_t *dst, int *offset, int len, int maxlen) printf("Config. ROM is too large for the buffer\n"); return(-1); } - memcpy( (char *)(dst + *offset), src, len * sizeof(uint32_t)); + memcpy((char *)(dst + *offset), src, len * sizeof(uint32_t)); *offset += len; return(0); } diff --git a/sys/dev/ieee1394/fwdev.c b/sys/dev/ieee1394/fwdev.c index 226a84a005e..d082d83b0e5 100644 --- a/sys/dev/ieee1394/fwdev.c +++ b/sys/dev/ieee1394/fwdev.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwdev.c,v 1.16 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: fwdev.c,v 1.17 2009/04/18 14:58:02 tsutsui Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.16 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.17 2009/04/18 14:58:02 tsutsui Exp $"); #if defined(__FreeBSD__) #include <sys/param.h> @@ -479,7 +479,7 @@ fw_write_async(struct fw_drv1 *d, struct uio *uio, int ioflag) PAGE_SIZE/*XXX*/)) == NULL) return (ENOMEM); - memcpy( &xfer->send.hdr, &pkt, sizeof(struct fw_pkt)); + memcpy(&xfer->send.hdr, &pkt, sizeof(struct fw_pkt)); xfer->send.pay_len = uio->uio_resid; if (uio->uio_resid > 0) { if ((err = uiomove((void *)&xfer->send.payload[0], @@ -690,7 +690,7 @@ FW_IOCTL(fw) err = EINVAL; break; case FW_SSTBUF: - memcpy( &d->bufreq, ibufreq, sizeof(d->bufreq)); + memcpy(&d->bufreq, ibufreq, sizeof(d->bufreq)); break; case FW_GSTBUF: memset(&ibufreq->rx, 0, sizeof(ibufreq->rx)); @@ -742,7 +742,7 @@ FW_IOCTL(fw) break; } - memcpy( (void *)&xfer->send.hdr, fp, tinfo->hdr_len); + memcpy((void *)&xfer->send.hdr, fp, tinfo->hdr_len); if (pay_len > 0) bcopy((char *)fp + tinfo->hdr_len, (void *)xfer->send.payload, pay_len); @@ -775,8 +775,8 @@ FW_IOCTL(fw) } else { pay_len = 0; } - memcpy( fp, &xfer->recv.hdr, tinfo->hdr_len); - memcpy( (char *)fp + tinfo->hdr_len, xfer->recv.payload, pay_len); + memcpy(fp, &xfer->recv.hdr, tinfo->hdr_len); + memcpy((char *)fp + tinfo->hdr_len, xfer->recv.payload, pay_len); out: fw_xfer_free_buf(xfer); break; @@ -847,7 +847,7 @@ out: fwdevlst->info_len = len; break; case FW_GTPMAP: - memcpy( data, fc->topology_map, + memcpy(data, fc->topology_map, (fc->topology_map->crc_len + 1) * 4); break; case FW_GCROM: diff --git a/sys/dev/ieee1394/fwmem.c b/sys/dev/ieee1394/fwmem.c index 523f22ad16a..74c691d881f 100644 --- a/sys/dev/ieee1394/fwmem.c +++ b/sys/dev/ieee1394/fwmem.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwmem.c,v 1.10 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: fwmem.c,v 1.11 2009/04/18 14:58:02 tsutsui Exp $ */ /*- * Copyright (c) 2002-2003 * Hidetoshi Shimokawa. All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwmem.c,v 1.10 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwmem.c,v 1.11 2009/04/18 14:58:02 tsutsui Exp $"); #if defined(__FreeBSD__) __FBSDID("$FreeBSD: src/sys/dev/firewire/fwmem.c,v 1.34 2007/06/06 14:31:36 simokawa Exp $"); #endif @@ -417,7 +417,7 @@ FW_OPEN(fwmem) return ENOMEM; dev->si_iosize_max = DFLTPHYS; fms = (struct fwmem_softc *)dev->si_drv1; - memcpy( &fms->eui, &fwmem_eui64, sizeof(struct fw_eui64)); + memcpy(&fms->eui, &fwmem_eui64, sizeof(struct fw_eui64)); fms->sc = sc; fms->refcount = 1; STAILQ_INIT(&fms->xferlist); @@ -551,10 +551,10 @@ FW_IOCTL(fwmem) fms = (struct fwmem_softc *)dev->si_drv1; switch (cmd) { case FW_SDEUI64: - memcpy( &fms->eui, data, sizeof(struct fw_eui64)); + memcpy(&fms->eui, data, sizeof(struct fw_eui64)); break; case FW_GDEUI64: - memcpy( data, &fms->eui, sizeof(struct fw_eui64)); + memcpy(data, &fms->eui, sizeof(struct fw_eui64)); break; default: err = EINVAL; diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c index b66efa3ab61..695d5ee1ae5 100644 --- a/sys/dev/ieee1394/fwohci.c +++ b/sys/dev/ieee1394/fwohci.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci.c,v 1.119 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: fwohci.c,v 1.120 2009/04/18 14:58:02 tsutsui Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa @@ -37,7 +37,7 @@ * */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.119 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.120 2009/04/18 14:58:02 tsutsui Exp $"); #define ATRQ_CH 0 #define ATRS_CH 1 @@ -2924,13 +2924,13 @@ fwohci_arcv(struct fwohci_softc *sc, struct fwohci_dbch *dbch, int count) char *p; p = (char *)&pktbuf; - memcpy( p, buf, rlen); + memcpy(p, buf, rlen); p += rlen; /* this must be too long but harmless */ rlen = sizeof(pktbuf) - rlen; if (rlen < 0) printf("why rlen < 0\n"); - memcpy( p, db_tr->buf, rlen); + memcpy(p, db_tr->buf, rlen); ld += rlen; len -= rlen; hlen = fwohci_arcv_swap(&pktbuf, sizeof(pktbuf)); diff --git a/sys/dev/ieee1394/sbp.c b/sys/dev/ieee1394/sbp.c index 993fc275847..0433f43dd13 100644 --- a/sys/dev/ieee1394/sbp.c +++ b/sys/dev/ieee1394/sbp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbp.c,v 1.26 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: sbp.c,v 1.27 2009/04/18 14:58:02 tsutsui Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.26 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.27 2009/04/18 14:58:02 tsutsui Exp $"); #if defined(__FreeBSD__) #include <sys/param.h> @@ -1716,7 +1716,7 @@ END_DEBUG if(sbp_cmd_status->ill_len) sense->flags |= SSD_ILI; - memcpy( &sense->information[0], &sbp_cmd_status->info, 4); + memcpy(&sense->information[0], &sbp_cmd_status->info, 4); if (sbp_status->len <= 1) /* XXX not scsi status. shouldn't be happened */ @@ -1728,13 +1728,13 @@ END_DEBUG /* fru, sense_key_spec */ sense->asl = 10; - memcpy( &sense->csi[0], &sbp_cmd_status->cdb, 4); + memcpy(&sense->csi[0], &sbp_cmd_status->cdb, 4); sense->asc = sbp_cmd_status->s_code; sense->ascq = sbp_cmd_status->s_qlfr; sense->fruc = sbp_cmd_status->fru; - memcpy( &sense->sks[0], &sbp_cmd_status->s_keydep[0], 3); + memcpy(&sense->sks[0], &sbp_cmd_status->s_keydep[0], 3); SCSI_XFER_ERROR(ocb->sxfer) = XS_SENSE; SCSI_XFER_STATUS(ocb->sxfer) = sbp_cmd_status->status; /* @@ -1789,9 +1789,9 @@ END_DEBUG * Some devices sometimes return strange strings. */ #if 1 - memcpy( inq->vendor, sdev->vendor, sizeof(inq->vendor)); - memcpy( inq->product, sdev->product, sizeof(inq->product)); - memcpy( inq->revision, sdev->revision+2, sizeof(inq->revision)); + memcpy(inq->vendor, sdev->vendor, sizeof(inq->vendor)); + memcpy(inq->product, sdev->product, sizeof(inq->product)); + memcpy(inq->revision, sdev->revision+2, sizeof(inq->revision)); #endif break; } @@ -2654,7 +2654,7 @@ END_DEBUG printf("sbp: CAM_DATA_PHYS\n"); cdb = SCSI_XFER_CMD(sxfer); - memcpy( (void *)&ocb->orb[5], cdb, SCSI_XFER_CMDLEN(sxfer)); + memcpy((void *)&ocb->orb[5], cdb, SCSI_XFER_CMDLEN(sxfer)); /* printf("ORB %08x %08x %08x %08x\n", ntohl(ocb->orb[0]), ntohl(ocb->orb[1]), ntohl(ocb->orb[2]), ntohl(ocb->orb[3])); printf("ORB %08x %08x %08x %08x\n", ntohl(ocb->orb[4]), ntohl(ocb->orb[5]), ntohl(ocb->orb[6]), ntohl(ocb->orb[7])); @@ -3139,7 +3139,7 @@ sbp_abort_all_ocbs(struct sbp_dev *sdev, int status) s = splfw(); - memcpy( &temp, &sdev->ocbs, sizeof(temp)); + memcpy(&temp, &sdev->ocbs, sizeof(temp)); STAILQ_INIT(&sdev->ocbs); for (ocb = STAILQ_FIRST(&temp); ocb != NULL; ocb = next) { next = STAILQ_NEXT(ocb, ocb); diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c index 632536ef343..ae90d884759 100644 --- a/sys/dev/if_ndis/if_ndis.c +++ b/sys/dev/if_ndis/if_ndis.c @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.69.2.6 2005/03/31 04:24:36 wpaul Exp $"); #endif #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.26 2009/04/15 20:44:25 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ndis.c,v 1.27 2009/04/18 14:58:03 tsutsui Exp $"); #endif @@ -285,7 +285,7 @@ ndis_setmulti(struct ndis_softc *sc) * But for right now I'm assuming there is only a single address. ***************************************************************************** */ - memcpy( mclist + (ETHER_ADDR_LEN * len), ifma->enm_addrlo, + memcpy(mclist + (ETHER_ADDR_LEN * len), ifma->enm_addrlo, ETHER_ADDR_LEN); len++; if (len > mclistsz) { @@ -1807,7 +1807,7 @@ ic = &sc->ic; if (ssid.ns_ssidlen == 0) { ssid.ns_ssidlen = 1; } else - memcpy( ssid.ns_ssid, ic->ic_des_essid, ssid.ns_ssidlen); + memcpy(ssid.ns_ssid, ic->ic_des_essid, ssid.ns_ssidlen); rval = ndis_set_info(sc, OID_802_11_SSID, &ssid, &len); if (rval) @@ -1913,7 +1913,7 @@ ndis_get_assoc(struct ndis_softc *sc, ndis_wlan_bssid_ex **assoc) free(bl, M_TEMP); return(ENOMEM); } - memcpy( (char *)*assoc, (char *)bs, bs->nwbx_len); + memcpy((char *)*assoc, (char *)bs, bs->nwbx_len); free(bl, M_TEMP); return(0); } @@ -1978,7 +1978,7 @@ ndis_getstate_80211(struct ndis_softc *sc) if (rval) aprint_error_dev(sc->ndis_dev, "get ssid failed: %d\n", rval); - memcpy( ic->ic_bss->ni_essid, ssid.ns_ssid, ssid.ns_ssidlen); + memcpy(ic->ic_bss->ni_essid, ssid.ns_ssid, ssid.ns_ssidlen); ic->ic_bss->ni_esslen = ssid.ns_ssidlen; len = sizeof(arg); @@ -2209,10 +2209,10 @@ ndis_wi_ioctl_get(struct ifnet *ifp, u_long command, void * data) wb = bl->nblx_bssid; while (maxaps--) { memset(api, 0, sizeof(*api)); - memcpy( &api->bssid, &wb->nwbx_macaddr, + memcpy(&api->bssid, &wb->nwbx_macaddr, sizeof(api->bssid)); api->namelen = wb->nwbx_ssid.ns_ssidlen; - memcpy( &api->name, &wb->nwbx_ssid.ns_ssid, api->namelen); + memcpy(&api->name, &wb->nwbx_ssid.ns_ssid, api->namelen); if (wb->nwbx_privacy) api->capinfo |= IEEE80211_CAPINFO_PRIVACY; /* XXX Where can we get noise information? */ diff --git a/sys/dev/marvell/gtmpsc.c b/sys/dev/marvell/gtmpsc.c index de02791d166..33ee398209c 100644 --- a/sys/dev/marvell/gtmpsc.c +++ b/sys/dev/marvell/gtmpsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: gtmpsc.c,v 1.34 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: gtmpsc.c,v 1.35 2009/04/18 14:58:03 tsutsui Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.34 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.35 2009/04/18 14:58:03 tsutsui Exp $"); #include "opt_kgdb.h" @@ -1466,7 +1466,7 @@ gtmpsc_common_pollc(unsigned int unit, char *cp, int *statp) GTMPSC_CACHE_FLUSH(csrp); return 0; } - memcpy( sc->gtmpsc_rxbuf, vrxp->rxbuf, nc); + memcpy(sc->gtmpsc_rxbuf, vrxp->rxbuf, nc); desc_write(csrp, csr); GTMPSC_CACHE_FLUSH(csrp); } @@ -1540,7 +1540,7 @@ gtmpsc_common_getc(unsigned int unit) nc = desc_read(&vrxp->rxdesc.sdma_cnt); nc &= SDMA_RX_CNT_BCNT_MASK; if (nc) { - memcpy( sc->gtmpsc_rxbuf, vrxp->rxbuf, nc); + memcpy(sc->gtmpsc_rxbuf, vrxp->rxbuf, nc); } else { if ((++ix) >= GTMPSC_NRXDESC) ix = 0; @@ -1598,7 +1598,7 @@ gtmpsc_common_putn(struct gtmpsc_softc *sc) n = sc->sc_tbc; if (n > GTMPSC_TXBUFSZ) n = GTMPSC_TXBUFSZ; - memcpy( vtxp->txbuf, sc->sc_tba, n); + memcpy(vtxp->txbuf, sc->sc_tba, n); csr = SDMA_CSR_TX_L | SDMA_CSR_TX_F | SDMA_CSR_TX_EI | SDMA_CSR_TX_OWN; desc_write(&vtxp->txdesc.sdma_cnt, diff --git a/sys/dev/mscp/mscp.c b/sys/dev/mscp/mscp.c index c07b26b26fc..43bcf31f734 100644 --- a/sys/dev/mscp/mscp.c +++ b/sys/dev/mscp/mscp.c @@ -1,4 +1,4 @@ -/* $NetBSD: mscp.c,v 1.32 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: mscp.c,v 1.33 2009/04/18 14:58:03 tsutsui Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.32 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.33 2009/04/18 14:58:03 tsutsui Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -288,7 +288,7 @@ loop: * status. */ if (cold) - memcpy( &slavereply, mp, sizeof(struct mscp)); + memcpy(&slavereply, mp, sizeof(struct mscp)); if (mp->mscp_status == (M_ST_OFFLINE|M_OFFLINE_UNKNOWN)) break; diff --git a/sys/dev/mscp/mscp_disk.c b/sys/dev/mscp/mscp_disk.c index 7a7c3f36890..eed2553fa4b 100644 --- a/sys/dev/mscp/mscp_disk.c +++ b/sys/dev/mscp/mscp_disk.c @@ -1,4 +1,4 @@ -/* $NetBSD: mscp_disk.c,v 1.67 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: mscp_disk.c,v 1.68 2009/04/18 14:58:03 tsutsui Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. * All rights reserved. @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.67 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.68 2009/04/18 14:58:03 tsutsui Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -424,14 +424,14 @@ raioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) switch (cmd) { case DIOCGDINFO: - memcpy( data, lp, sizeof (struct disklabel)); + memcpy(data, lp, sizeof (struct disklabel)); break; #ifdef __HAVE_OLD_DISKLABEL case ODIOCGDINFO: - memcpy( &newlabel, lp, sizeof disklabel); + memcpy(&newlabel, lp, sizeof disklabel); if (newlabel.d_npartitions > OLDMAXPARTITIONS) return ENOTTY; - memcpy( data, &newlabel, sizeof (struct olddisklabel)); + memcpy(data, &newlabel, sizeof (struct olddisklabel)); break; #endif @@ -827,7 +827,7 @@ rxioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l) switch (cmd) { case DIOCGDINFO: - memcpy( data, lp, sizeof (struct disklabel)); + memcpy(data, lp, sizeof (struct disklabel)); break; case DIOCGPART: diff --git a/sys/dev/ofw/ofnet.c b/sys/dev/ofw/ofnet.c index 864f9bdf39c..93c1a6baefb 100644 --- a/sys/dev/ofw/ofnet.c +++ b/sys/dev/ofw/ofnet.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofnet.c,v 1.45 2009/03/20 05:26:37 cegger Exp $ */ +/* $NetBSD: ofnet.c,v 1.46 2009/04/18 14:58:03 tsutsui Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.45 2009/03/20 05:26:37 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.46 2009/04/18 14:58:03 tsutsui Exp $"); #include "ofnet.h" #include "opt_inet.h" @@ -340,7 +340,7 @@ ofnet_start(struct ifnet *ifp) } for (bufp = buf; (m = m0) != NULL;) { - memcpy( bufp, mtod(m, char *), m->m_len); + memcpy(bufp, mtod(m, char *), m->m_len); bufp += m->m_len; MFREE(m, m0); } diff --git a/sys/dev/pci/cxgb_main.c b/sys/dev/pci/cxgb_main.c index 717e2a17d45..bd9eddca2a9 100644 --- a/sys/dev/pci/cxgb_main.c +++ b/sys/dev/pci/cxgb_main.c @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. #include <sys/cdefs.h> #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.13 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cxgb_main.c,v 1.14 2009/04/18 14:58:03 tsutsui Exp $"); #endif #ifdef __FreeBSD__ __FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.36 2007/09/11 23:49:27 kmacy Exp $"); @@ -1659,7 +1659,7 @@ t3_os_set_hw_addr(adapter_t *adapter, int port_idx, u8 hw_addr[]) printf("set_hw_addr on idx %d addr %02x:%02x:%02x:%02x:%02x:%02x\n", port_idx, hw_addr[0], hw_addr[1], hw_addr[2], hw_addr[3], hw_addr[4], hw_addr[5]); #endif - memcpy( adapter->port[port_idx].hw_addr, hw_addr, ETHER_ADDR_LEN); + memcpy(adapter->port[port_idx].hw_addr, hw_addr, ETHER_ADDR_LEN); } /** diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c index 4a2a1617aa7..3d10f460f32 100644 --- a/sys/dev/pci/hifn7751.c +++ b/sys/dev/pci/hifn7751.c @@ -1,4 +1,4 @@ -/* $NetBSD: hifn7751.c,v 1.40 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: hifn7751.c,v 1.41 2009/04/18 14:58:03 tsutsui Exp $ */ /* $FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */ /* $OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $ */ @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.40 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hifn7751.c,v 1.41 2009/04/18 14:58:03 tsutsui Exp $"); #include "rnd.h" @@ -1087,13 +1087,13 @@ hifn_sramsize(struct hifn_softc *sc) for (i = HIFN_SRAM_GRANULARITY - 1; i >= 0; i--) { a = i * HIFN_SRAM_STEP_SIZE; - memcpy( data, &i, sizeof(i)); + memcpy(data, &i, sizeof(i)); hifn_writeramaddr(sc, a, data); } for (i = 0; i < HIFN_SRAM_GRANULARITY; i++) { a = i * HIFN_SRAM_STEP_SIZE; - memcpy( dataexpect, &i, sizeof(i)); + memcpy(dataexpect, &i, sizeof(i)); if (hifn_readramaddr(sc, a, data) < 0) return (0); if (memcmp(data, dataexpect, sizeof(data)) != 0) @@ -1196,7 +1196,7 @@ hifn_writeramaddr(struct hifn_softc *sc, int addr, u_int8_t *data) /* build write command */ memset(dma->command_bufs[cmdi], 0, HIFN_MAX_COMMAND); *(struct hifn_base_command *)dma->command_bufs[cmdi] = wc; - memcpy( &dma->test_src, data, sizeof(dma->test_src)); + memcpy(&dma->test_src, data, sizeof(dma->test_src)); dma->srcr[srci].p = htole32(sc->sc_dmamap->dm_segs[0].ds_addr + offsetof(struct hifn_dma, test_src)); @@ -1294,7 +1294,7 @@ hifn_readramaddr(struct hifn_softc *sc, int addr, u_int8_t *data) r = -1; } else { r = 0; - memcpy( data, &dma->test_dst, sizeof(dma->test_dst)); + memcpy(data, &dma->test_dst, sizeof(dma->test_dst)); } WRITE_REG_1(sc, HIFN_1_DMA_CSR, @@ -1415,18 +1415,18 @@ hifn_write_command(struct hifn_command *cmd, u_int8_t *buf) } if (using_mac && cmd->mac_masks & HIFN_MAC_CMD_NEW_KEY) { - memcpy( buf_pos, cmd->mac, HIFN_MAC_KEY_LENGTH); + memcpy(buf_pos, cmd->mac, HIFN_MAC_KEY_LENGTH); buf_pos += HIFN_MAC_KEY_LENGTH; } if (using_crypt && cmd->cry_masks & HIFN_CRYPT_CMD_NEW_KEY) { switch (cmd->cry_masks & HIFN_CRYPT_CMD_ALG_MASK) { case HIFN_CRYPT_CMD_ALG_3DES: - memcpy( buf_pos, cmd->ck, HIFN_3DES_KEY_LENGTH); + memcpy(buf_pos, cmd->ck, HIFN_3DES_KEY_LENGTH); buf_pos += HIFN_3DES_KEY_LENGTH; break; case HIFN_CRYPT_CMD_ALG_DES: - memcpy( buf_pos, cmd->ck, HIFN_DES_KEY_LENGTH); + memcpy(buf_pos, cmd->ck, HIFN_DES_KEY_LENGTH); buf_pos += HIFN_DES_KEY_LENGTH; break; case HIFN_CRYPT_CMD_ALG_RC4: @@ -1435,7 +1435,7 @@ hifn_write_command(struct hifn_command *cmd, u_int8_t *buf) int clen; clen = MIN(cmd->cklen, len); - memcpy( buf_pos, cmd->ck, clen); + memcpy(buf_pos, cmd->ck, clen); len -= clen; buf_pos += clen; } while (len > 0); @@ -1447,7 +1447,7 @@ hifn_write_command(struct hifn_command *cmd, u_int8_t *buf) * AES keys are variable 128, 192 and * 256 bits (16, 24 and 32 bytes). */ - memcpy( buf_pos, cmd->ck, cmd->cklen); + memcpy(buf_pos, cmd->ck, cmd->cklen); buf_pos += cmd->cklen; break; } @@ -1462,7 +1462,7 @@ hifn_write_command(struct hifn_command *cmd, u_int8_t *buf) ivlen = HIFN_IV_LENGTH; break; } - memcpy( buf_pos, cmd->iv, ivlen); + memcpy(buf_pos, cmd->iv, ivlen); buf_pos += ivlen; } @@ -2283,7 +2283,7 @@ hifn_process(void *arg, struct cryptop *crp, int hint) HIFN_AES_IV_LENGTH : HIFN_IV_LENGTH); if (enccrd->crd_flags & CRD_F_ENCRYPT) { if (enccrd->crd_flags & CRD_F_IV_EXPLICIT) - memcpy( cmd->iv, enccrd->crd_iv, ivlen); + memcpy(cmd->iv, enccrd->crd_iv, ivlen); else bcopy(sc->sc_sessions[session].hs_iv, cmd->iv, ivlen); @@ -2301,7 +2301,7 @@ hifn_process(void *arg, struct cryptop *crp, int hint) } } else { if (enccrd->crd_flags & CRD_F_IV_EXPLICIT) - memcpy( cmd->iv, enccrd->crd_iv, ivlen); + memcpy(cmd->iv, enccrd->crd_iv, ivlen); else if (crp->crp_flags & CRYPTO_F_IMBUF) m_copydata(cmd->srcu.src_m, enccrd->crd_inject, ivlen, cmd->iv); @@ -2370,7 +2370,7 @@ hifn_process(void *arg, struct cryptop *crp, int hint) maccrd->crd_alg == CRYPTO_MD5_HMAC_96) && sc->sc_sessions[session].hs_state == HS_STATE_USED) { cmd->mac_masks |= HIFN_MAC_CMD_NEW_KEY; - memcpy( cmd->mac, maccrd->crd_key, maccrd->crd_klen >> 3); + memcpy(cmd->mac, maccrd->crd_key, maccrd->crd_klen >> 3); memset(cmd->mac + (maccrd->crd_klen >> 3), 0, HIFN_MAC_KEY_LENGTH - (maccrd->crd_klen >> 3)); } @@ -2608,7 +2608,7 @@ hifn_callback(struct hifn_softc *sc, struct hifn_command *cmd, u_int8_t *resbuf) m_copyback((struct mbuf *)crp->crp_buf, crd->crd_inject, len, macbuf); else if ((crp->crp_flags & CRYPTO_F_IOV) && crp->crp_mac) - memcpy( crp->crp_mac, (void *)macbuf, len); + memcpy(crp->crp_mac, (void *)macbuf, len); break; } } @@ -2875,7 +2875,7 @@ hifn_callback_comp(struct hifn_softc *sc, struct hifn_command *cmd, dstsize = cmd->dst_map->dm_mapsize; bus_dmamap_unload(sc->sc_dmat, cmd->dst_map); - memcpy( &baseres, resbuf, sizeof(struct hifn_base_result)); + memcpy(&baseres, resbuf, sizeof(struct hifn_base_result)); i = dma->dstk; u = dma->dstu; while (u != 0) { diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c index ebf10260565..04f66308452 100644 --- a/sys/dev/pci/if_fpa.c +++ b/sys/dev/pci/if_fpa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fpa.c,v 1.51 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: if_fpa.c,v 1.52 2009/04/18 14:58:03 tsutsui Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.51 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.52 2009/04/18 14:58:03 tsutsui Exp $"); #ifdef __NetBSD__ #include "opt_inet.h" @@ -223,7 +223,7 @@ pdq_pci_attach( free((void *) sc, M_DEVBUF); return; } - memcpy( sc->sc_ac.ac_enaddr, (void *) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, 6); + memcpy(sc->sc_ac.ac_enaddr, (void *) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, 6); pdqs_pci[unit] = sc; pdq_ifattach(sc, pdq_pci_ifwatchdog); pci_map_int(config_id, pdq_pci_ifintr, (void*) sc, &net_imask); @@ -365,7 +365,7 @@ pdq_pci_attach( return; } - memcpy( sc->sc_ac.ac_enaddr, (void *) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, 6); + memcpy(sc->sc_ac.ac_enaddr, (void *) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, 6); pdq_ifattach(sc, pdq_pci_ifwatchdog); diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c index 0b9f8854933..bb46d3c6db0 100644 --- a/sys/dev/pci/if_jme.c +++ b/sys/dev/pci/if_jme.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_jme.c,v 1.8 2009/03/18 17:06:49 cegger Exp $ */ +/* $NetBSD: if_jme.c,v 1.9 2009/04/18 14:58:03 tsutsui Exp $ */ /* * Copyright (c) 2008 Manuel Bouyer. All rights reserved. @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.8 2009/03/18 17:06:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.9 2009/04/18 14:58:03 tsutsui Exp $"); #include <sys/param.h> @@ -781,7 +781,7 @@ jme_init(struct ifnet *ifp, int do_ifinit) sc->jme_tx_cons = sc->jme_tx_prod = sc->jme_tx_cnt = 0; /* Reprogram the station address. */ - memcpy( eaddr, CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN); + memcpy(eaddr, CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN); bus_space_write_4(sc->jme_bt_mac, sc->jme_bh_mac, JME_PAR0, eaddr[3] << 24 | eaddr[2] << 16 | eaddr[1] << 8 | eaddr[0]); bus_space_write_4(sc->jme_bt_mac, sc->jme_bh_mac, @@ -1998,7 +1998,7 @@ jme_eeprom_macaddr(struct jme_softc *sc) } while (match != ETHER_ADDR_LEN && offset < JME_EEPROM_END); if (match == ETHER_ADDR_LEN) { - memcpy( sc->jme_enaddr, eaddr, ETHER_ADDR_LEN); + memcpy(sc->jme_enaddr, eaddr, ETHER_ADDR_LEN); return (0); } diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c index 720304a5419..82d3afe8d56 100644 --- a/sys/dev/pci/if_txp.c +++ b/sys/dev/pci/if_txp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_txp.c,v 1.33 2009/03/18 17:06:50 cegger Exp $ */ +/* $NetBSD: if_txp.c,v 1.34 2009/04/18 14:58:03 tsutsui Exp $ */ /* * Copyright (c) 2001 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.33 2009/03/18 17:06:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.34 2009/04/18 14:58:03 tsutsui Exp $"); #include "bpfilter.h" #include "opt_inet.h" @@ -555,7 +555,7 @@ txp_download_fw_section(struct txp_softc *sc, const struct txp_fw_section_header return (-1); } - memcpy( dma.dma_vaddr, ((const u_int8_t *)sect) + sizeof(*sect), + memcpy(dma.dma_vaddr, ((const u_int8_t *)sect) + sizeof(*sect), le32toh(sect->nbytes)); /* @@ -682,7 +682,7 @@ txp_rx_reclaim(struct txp_softc *sc, struct txp_rx_ring *r, struct txp_dma_alloc } /* retrieve stashed pointer */ - memcpy( &sd, __UNVOLATILE(&rxd->rx_vaddrlo), sizeof(sd)); + memcpy(&sd, __UNVOLATILE(&rxd->rx_vaddrlo), sizeof(sd)); bus_dmamap_sync(sc->sc_dmat, sd->sd_map, 0, sd->sd_map->dm_mapsize, BUS_DMASYNC_POSTREAD); @@ -718,7 +718,7 @@ txp_rx_reclaim(struct txp_softc *sc, struct txp_rx_ring *r, struct txp_dma_alloc mnew->m_pkthdr.rcvif = ifp; mnew->m_pkthdr.len = mnew->m_len = m->m_len; mnew->m_data += 2; - memcpy( mnew->m_data, m->m_data, m->m_len); + memcpy(mnew->m_data, m->m_data, m->m_len); m_freem(m); m = mnew; } @@ -822,7 +822,7 @@ txp_rxbuf_reclaim(struct txp_softc *sc) sizeof(struct txp_rxbuf_desc), BUS_DMASYNC_POSTWRITE); /* stash away pointer */ - memcpy( __UNVOLATILE(&rbd->rb_vaddrlo), &sd, sizeof(sd)); + memcpy(__UNVOLATILE(&rbd->rb_vaddrlo), &sd, sizeof(sd)); rbd->rb_paddrlo = ((u_int64_t)sd->sd_map->dm_segs[0].ds_addr) & 0xffffffff; @@ -1072,7 +1072,7 @@ txp_alloc_rings(struct txp_softc *sc) sd = (struct txp_swdesc *)malloc(sizeof(struct txp_swdesc), M_DEVBUF, M_NOWAIT); /* stash away pointer */ - memcpy( __UNVOLATILE(&sc->sc_rxbufs[nb].rb_vaddrlo), &sd, sizeof(sd)); + memcpy(__UNVOLATILE(&sc->sc_rxbufs[nb].rb_vaddrlo), &sd, sizeof(sd)); if (sd == NULL) break; @@ -1162,7 +1162,7 @@ bail_rxbufring: if (nb == RXBUF_ENTRIES) nb--; for (i = 0; i <= nb; i++) { - memcpy( &sd, __UNVOLATILE(&sc->sc_rxbufs[i].rb_vaddrlo), + memcpy(&sd, __UNVOLATILE(&sc->sc_rxbufs[i].rb_vaddrlo), sizeof(sd)); if (sd) free(sd, M_DEVBUF); @@ -1607,7 +1607,7 @@ txp_command2(struct txp_softc *sc, u_int16_t id, u_int16_t in1, u_int32_t in2, u for (i = 0; i < in_extn; i++) { ext = (struct txp_ext_desc *)(((u_int8_t *)sc->sc_cmdring.base) + idx); - memcpy( ext, in_extp, sizeof(struct txp_ext_desc)); + memcpy(ext, in_extp, sizeof(struct txp_ext_desc)); in_extp++; idx += sizeof(struct txp_cmd_desc); if (idx == sc->sc_cmdring.size) @@ -1704,7 +1704,7 @@ txp_rsp_fixup(struct txp_softc *sc, struct txp_rsp_desc *rsp, struct txp_rsp_des for (i = 0; i < rsp->rsp_numdesc + 1; i++) { if (dst != NULL) - memcpy( dst++, src, sizeof(struct txp_rsp_desc)); + memcpy(dst++, src, sizeof(struct txp_rsp_desc)); ridx += sizeof(struct txp_rsp_desc); if (ridx == sc->sc_rspring.size) { src = sc->sc_rspring.base; diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c index 3080dbd3ff8..365bfa521fa 100644 --- a/sys/dev/pci/ubsec.c +++ b/sys/dev/pci/ubsec.c @@ -1,4 +1,4 @@ -/* $NetBSD: ubsec.c,v 1.19 2009/03/18 17:06:50 cegger Exp $ */ +/* $NetBSD: ubsec.c,v 1.20 2009/04/18 14:58:03 tsutsui Exp $ */ /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */ /* $OpenBSD: ubsec.c,v 1.127 2003/06/04 14:04:58 jason Exp $ */ @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.19 2009/03/18 17:06:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.20 2009/04/18 14:58:03 tsutsui Exp $"); #undef UBSEC_DEBUG @@ -680,7 +680,7 @@ ubsec_feed(struct ubsec_softc *sc) v = ((void *)&q2->q_dma->d_dma->d_mcr); v = (char*)v + (sizeof(struct ubsec_mcr) - sizeof(struct ubsec_mcr_add)); - memcpy( &q->q_dma->d_dma->d_mcradd[i], v, sizeof(struct ubsec_mcr_add)); + memcpy(&q->q_dma->d_dma->d_mcradd[i], v, sizeof(struct ubsec_mcr_add)); q->q_stacked_mcr[i] = q2; } q->q_dma->d_dma->d_mcr.mcr_pkts = htole16(npkts); @@ -795,7 +795,7 @@ ubsec_newsession(void *arg, u_int32_t *sidp, struct cryptoini *cri) sizeof(struct ubsec_session), M_DEVBUF, M_NOWAIT); if (ses == NULL) return (ENOMEM); - memcpy( ses, sc->sc_sessions, sesn * + memcpy(ses, sc->sc_sessions, sesn * sizeof(struct ubsec_session)); memset(sc->sc_sessions, 0, sesn * sizeof(struct ubsec_session)); @@ -819,11 +819,11 @@ ubsec_newsession(void *arg, u_int32_t *sidp, struct cryptoini *cri) /* Go ahead and compute key in ubsec's byte order */ if (encini->cri_alg == CRYPTO_DES_CBC) { - memcpy( &ses->ses_deskey[0], encini->cri_key, 8); - memcpy( &ses->ses_deskey[2], encini->cri_key, 8); - memcpy( &ses->ses_deskey[4], encini->cri_key, 8); + memcpy(&ses->ses_deskey[0], encini->cri_key, 8); + memcpy(&ses->ses_deskey[2], encini->cri_key, 8); + memcpy(&ses->ses_deskey[4], encini->cri_key, 8); } else - memcpy( ses->ses_deskey, encini->cri_key, 24); + memcpy(ses->ses_deskey, encini->cri_key, 24); SWAP32(ses->ses_deskey[0]); SWAP32(ses->ses_deskey[1]); @@ -843,7 +843,7 @@ ubsec_newsession(void *arg, u_int32_t *sidp, struct cryptoini *cri) macini->cri_klen / 8); MD5Update(&md5ctx, hmac_ipad_buffer, HMAC_BLOCK_LEN - (macini->cri_klen / 8)); - memcpy( ses->ses_hminner, md5ctx.state, + memcpy(ses->ses_hminner, md5ctx.state, sizeof(md5ctx.state)); } else { SHA1Init(&sha1ctx); @@ -851,7 +851,7 @@ ubsec_newsession(void *arg, u_int32_t *sidp, struct cryptoini *cri) macini->cri_klen / 8); SHA1Update(&sha1ctx, hmac_ipad_buffer, HMAC_BLOCK_LEN - (macini->cri_klen / 8)); - memcpy( ses->ses_hminner, sha1ctx.state, + memcpy(ses->ses_hminner, sha1ctx.state, sizeof(sha1ctx.state)); } @@ -864,7 +864,7 @@ ubsec_newsession(void *arg, u_int32_t *sidp, struct cryptoini *cri) macini->cri_klen / 8); MD5Update(&md5ctx, hmac_opad_buffer, HMAC_BLOCK_LEN - (macini->cri_klen / 8)); - memcpy( ses->ses_hmouter, md5ctx.state, + memcpy(ses->ses_hmouter, md5ctx.state, sizeof(md5ctx.state)); } else { SHA1Init(&sha1ctx); @@ -872,7 +872,7 @@ ubsec_newsession(void *arg, u_int32_t *sidp, struct cryptoini *cri) macini->cri_klen / 8); SHA1Update(&sha1ctx, hmac_opad_buffer, HMAC_BLOCK_LEN - (macini->cri_klen / 8)); - memcpy( ses->ses_hmouter, sha1ctx.state, + memcpy(ses->ses_hmouter, sha1ctx.state, sizeof(sha1ctx.state)); } @@ -920,7 +920,7 @@ ubsec_op_cb(void *arg, bus_dma_segment_t *seg, int nsegs, bus_size_t mapsize, in #endif op->mapsize = mapsize; op->nsegs = nsegs; - memcpy( op->segs, seg, nsegs * sizeof (seg[0])); + memcpy(op->segs, seg, nsegs * sizeof (seg[0])); } #endif @@ -1047,7 +1047,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint) q->q_flags |= UBSEC_QFLAGS_COPYOUTIV; if (enccrd->crd_flags & CRD_F_IV_EXPLICIT) - memcpy( ctx.pc_iv, enccrd->crd_iv, 8); + memcpy(ctx.pc_iv, enccrd->crd_iv, 8); else { ctx.pc_iv[0] = ses->ses_iv[0]; ctx.pc_iv[1] = ses->ses_iv[1]; @@ -1067,7 +1067,7 @@ ubsec_process(void *arg, struct cryptop *crp, int hint) ctx.pc_flags |= htole16(UBS_PKTCTX_INBOUND); if (enccrd->crd_flags & CRD_F_IV_EXPLICIT) - memcpy( ctx.pc_iv, enccrd->crd_iv, 8); + memcpy(ctx.pc_iv, enccrd->crd_iv, 8); else if (crp->crp_flags & CRYPTO_F_IMBUF) m_copydata(q->q_src_m, enccrd->crd_inject, 8, (void *)ctx.pc_iv); @@ -2436,7 +2436,7 @@ ubsec_kprocess_modexp_hw(struct ubsec_softc *sc, struct cryptkop *krp, ctx = (struct ubsec_ctx_modexp *)me->me_q.q_ctx.dma_vaddr; memset(ctx, 0, sizeof(*ctx)); - memcpy( ctx->me_N, krp->krp_param[UBS_MODEXP_PAR_N].crp_p, + memcpy(ctx->me_N, krp->krp_param[UBS_MODEXP_PAR_N].crp_p, (nbits + 7) / 8); ctx->me_len = htole16((normbits / 8) + (4 * sizeof(u_int16_t))); ctx->me_op = htole16(UBS_CTXOP_MODEXP); diff --git a/sys/dev/qbus/if_de.c b/sys/dev/qbus/if_de.c index 82fbe766b1f..7779275bba3 100644 --- a/sys/dev/qbus/if_de.c +++ b/sys/dev/qbus/if_de.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_de.c,v 1.25 2009/03/18 17:06:50 cegger Exp $ */ +/* $NetBSD: if_de.c,v 1.26 2009/04/18 14:58:03 tsutsui Exp $ */ /* * Copyright (c) 1982, 1986, 1989 Regents of the University of California. @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.25 2009/03/18 17:06:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.26 2009/04/18 14:58:03 tsutsui Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -261,7 +261,7 @@ deattach(device_t parent, device_t self, void *aux) DE_WLOW(CMD_GETCMD); dewait(sc, "read addr "); - memcpy( myaddr, (void *)&sc->sc_dedata->dc_pcbb.pcbb2, sizeof (myaddr)); + memcpy(myaddr, (void *)&sc->sc_dedata->dc_pcbb.pcbb2, sizeof (myaddr)); printf(": %s, hardware address %s\n", c, ether_sprintf(myaddr)); uba_intr_establish(ua->ua_icookie, ua->ua_cvec, deintr, sc, diff --git a/sys/dev/qbus/if_il.c b/sys/dev/qbus/if_il.c index 657b1240b8c..4e63b9a3ded 100644 --- a/sys/dev/qbus/if_il.c +++ b/sys/dev/qbus/if_il.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_il.c,v 1.21 2009/03/18 17:06:50 cegger Exp $ */ +/* $NetBSD: if_il.c,v 1.22 2009/04/18 14:58:03 tsutsui Exp $ */ /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.21 2009/03/18 17:06:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.22 2009/04/18 14:58:03 tsutsui Exp $"); #include "opt_inet.h" @@ -304,7 +304,7 @@ ilinit(struct ifnet *ifp) * wedge the board. */ if (sc->sc_flags & ILF_SETADDR) { - memcpy( &sc->sc_isu, CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN); + memcpy(&sc->sc_isu, CLLADDR(ifp->if_sadl), ETHER_ADDR_LEN); IL_WCSR(IL_BAR, LOWORD(sc->sc_ui.ui_baddr)); IL_WCSR(IL_BCR, ETHER_ADDR_LEN); IL_WCSR(IL_CSR, ((sc->sc_ui.ui_baddr >> 2) & IL_EUA)|ILC_LDPA); @@ -606,7 +606,7 @@ il_setaddr(u_char *physaddr, struct il_softc *sc) if (! (sc->sc_flags & ILF_RUNNING)) return; - memcpy( (void *)is->is_addr, (void *)physaddr, sizeof is->is_addr); + memcpy((void *)is->is_addr, (void *)physaddr, sizeof is->is_addr); sc->sc_flags &= ~ILF_RUNNING; sc->sc_flags |= ILF_SETADDR; ilinit(&sc->sc_if); diff --git a/sys/dev/qbus/qd.c b/sys/dev/qbus/qd.c index f12321a1950..746f75ecd1a 100644 --- a/sys/dev/qbus/qd.c +++ b/sys/dev/qbus/qd.c @@ -1,4 +1,4 @@ -/* $NetBSD: qd.c,v 1.48 2009/03/18 17:06:50 cegger Exp $ */ +/* $NetBSD: qd.c,v 1.49 2009/04/18 14:58:03 tsutsui Exp $ */ /*- * Copyright (c) 1988 Regents of the University of California. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.48 2009/03/18 17:06:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.49 2009/04/18 14:58:03 tsutsui Exp $"); #include "opt_ddb.h" @@ -1107,7 +1107,7 @@ qdioctl(dev_t dev, u_long cmd, void *datap, int flags, struct proc *p) s = spl5(); GETEND(eq_header[unit]); splx(s); - memcpy( datap, (void *)event, sizeof(struct _vs_event)); + memcpy(datap, (void *)event, sizeof(struct _vs_event)); break; case QD_RESET: @@ -1226,7 +1226,7 @@ qdioctl(dev_t dev, u_long cmd, void *datap, int flags, struct proc *p) /* * stuff qdmap structure in return buffer */ - memcpy( datap, (void *)qd, sizeof(struct qdmap)); + memcpy(datap, (void *)qd, sizeof(struct qdmap)); break; diff --git a/sys/dev/qbus/rl.c b/sys/dev/qbus/rl.c index 7280112e326..d6ca4a4edee 100644 --- a/sys/dev/qbus/rl.c +++ b/sys/dev/qbus/rl.c @@ -1,4 +1,4 @@ -/* $NetBSD: rl.c,v 1.41 2009/03/18 17:06:50 cegger Exp $ */ +/* $NetBSD: rl.c,v 1.42 2009/04/18 14:58:03 tsutsui Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.41 2009/03/18 17:06:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.42 2009/04/18 14:58:03 tsutsui Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -433,7 +433,7 @@ rlioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l) switch (cmd) { case DIOCGDINFO: - memcpy( addr, lp, sizeof (struct disklabel)); + memcpy(addr, lp, sizeof (struct disklabel)); break; #ifdef __HAVE_OLD_DISKLABEL @@ -441,7 +441,7 @@ rlioctl(dev_t dev, u_long cmd, void *addr, int flag, struct lwp *l) newlabel = *lp; if (newlabel.d_npartitions > OLDMAXPARTITIONS) return ENOTTY; - memcpy( addr, &newlabel, sizeof (struct olddisklabel)); + memcpy(addr, &newlabel, sizeof (struct olddisklabel)); break; #endif diff --git a/sys/dev/sbus/tcx.c b/sys/dev/sbus/tcx.c index b49db4c8bf7..3cf65385270 100644 --- a/sys/dev/sbus/tcx.c +++ b/sys/dev/sbus/tcx.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcx.c,v 1.28 2009/03/18 17:06:50 cegger Exp $ */ +/* $NetBSD: tcx.c,v 1.29 2009/04/18 14:58:03 tsutsui Exp $ */ /* * Copyright (c) 1996,1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.28 2009/03/18 17:06:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.29 2009/04/18 14:58:03 tsutsui Exp $"); /* * define for cg8 emulation on S24 (24-bit version of tcx) for the SS5; @@ -253,7 +253,7 @@ tcxattach(struct device *parent, struct device *self, void *args) device_xname(self), sa->sa_nreg); return; } - memcpy( sc->sc_physadr, sa->sa_reg, + memcpy(sc->sc_physadr, sa->sa_reg, sa->sa_nreg * sizeof(struct openprom_addr)); /* XXX - fix THC and TEC offsets */ diff --git a/sys/dev/sun/bt_subr.c b/sys/dev/sun/bt_subr.c index 05c85611135..aa8e832ae65 100644 --- a/sys/dev/sun/bt_subr.c +++ b/sys/dev/sun/bt_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: bt_subr.c,v 1.12 2009/03/18 17:06:50 cegger Exp $ */ +/* $NetBSD: bt_subr.c,v 1.13 2009/04/18 14:58:04 tsutsui Exp $ */ /* * Copyright (c) 1993 @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.12 2009/03/18 17:06:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.13 2009/04/18 14:58:04 tsutsui Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -195,7 +195,7 @@ bt_initcmap(union bt_cmap *cm, int cmsize) * be replaced by more general colormap handling) */ extern u_char rasops_cmap[]; - memcpy( &cm->cm_map[1][0], rasops_cmap, 3*16); + memcpy(&cm->cm_map[1][0], rasops_cmap, 3*16); } #endif } diff --git a/sys/dev/tc/if_le_ioasic.c b/sys/dev/tc/if_le_ioasic.c index 7cdedea3acc..e4743ff54fa 100644 --- a/sys/dev/tc/if_le_ioasic.c +++ b/sys/dev/tc/if_le_ioasic.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_ioasic.c,v 1.32 2009/03/18 17:06:50 cegger Exp $ */ +/* $NetBSD: if_le_ioasic.c,v 1.33 2009/04/18 14:58:04 tsutsui Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_ioasic.c,v 1.32 2009/03/18 17:06:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_ioasic.c,v 1.33 2009/04/18 14:58:04 tsutsui Exp $"); #include "opt_inet.h" @@ -264,7 +264,7 @@ le_ioasic_copytobuf_gap16(struct lance_softc *sc, void *fromv, int boff, if (boff) { int xfer; xfer = min(len, 16 - boff); - memcpy( bptr + boff, from, xfer); + memcpy(bptr + boff, from, xfer); from += xfer; bptr += 32; len -= xfer; @@ -317,7 +317,7 @@ le_ioasic_copytobuf_gap16(struct lance_softc *sc, void *fromv, int boff, default: /* Does odd-aligned case ever happen? */ do { - memcpy( bptr, from, 16); + memcpy(bptr, from, 16); from += 16; bptr += 32; len -= 16; @@ -325,7 +325,7 @@ le_ioasic_copytobuf_gap16(struct lance_softc *sc, void *fromv, int boff, break; } if (len) - memcpy( bptr, from, len); + memcpy(bptr, from, len); } void @@ -343,7 +343,7 @@ le_ioasic_copyfrombuf_gap16(struct lance_softc *sc, void *tov, int boff, if (boff) { int xfer; xfer = min(len, 16 - boff); - memcpy( to, bptr + boff, xfer); + memcpy(to, bptr + boff, xfer); to += xfer; bptr += 32; len -= xfer; @@ -391,7 +391,7 @@ le_ioasic_copyfrombuf_gap16(struct lance_softc *sc, void *tov, int boff, /* XXX Does odd-byte-aligned case ever happen? */ default: do { - memcpy( to, bptr, 16); + memcpy(to, bptr, 16); to += 16; bptr += 32; len -= 16; @@ -399,7 +399,7 @@ le_ioasic_copyfrombuf_gap16(struct lance_softc *sc, void *tov, int boff, break; } if (len) - memcpy( to, bptr, len); + memcpy(to, bptr, len); } void diff --git a/sys/dev/tc/zs_ioasic.c b/sys/dev/tc/zs_ioasic.c index baa59f41184..d350fce89a2 100644 --- a/sys/dev/tc/zs_ioasic.c +++ b/sys/dev/tc/zs_ioasic.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs_ioasic.c,v 1.38 2009/03/18 17:06:50 cegger Exp $ */ +/* $NetBSD: zs_ioasic.c,v 1.39 2009/04/18 14:58:04 tsutsui Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.38 2009/03/18 17:06:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.39 2009/04/18 14:58:04 tsutsui Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -734,7 +734,7 @@ zs_ioasic_cninit(tc_addr_t ioasic_addr, tc_offset_t zs_offset, int channel) cs->cs_brg_clk = PCLK / 16; /* Initialize the pending registers. */ - memcpy( cs->cs_preg, zs_ioasic_init_reg, 16); + memcpy(cs->cs_preg, zs_ioasic_init_reg, 16); /* cs->cs_preg[5] |= (ZSWR5_DTR | ZSWR5_RTS); */ /* diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c index fec4587e57e..eddd65fbf60 100644 --- a/sys/dev/usb/if_cdce.c +++ b/sys/dev/usb/if_cdce.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cdce.c,v 1.20 2009/03/18 17:06:50 cegger Exp $ */ +/* $NetBSD: if_cdce.c,v 1.21 2009/04/18 14:58:04 tsutsui Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com> @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.20 2009/03/18 17:06:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.21 2009/04/18 14:58:04 tsutsui Exp $"); #include "bpfilter.h" #ifdef __NetBSD__ #include "opt_inet.h" @@ -344,7 +344,7 @@ cdce_encap(struct cdce_softc *sc, struct mbuf *m, int idx) u_int32_t crc; crc = cdce_crc32(c->cdce_buf, m->m_pkthdr.len); - memcpy( c->cdce_buf + m->m_pkthdr.len, &crc, 4); + memcpy(c->cdce_buf + m->m_pkthdr.len, &crc, 4); extra = 4; } c->cdce_mbuf = m; diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c index 072ff420bdf..7b1140f9d74 100644 --- a/sys/dev/vme/xd.c +++ b/sys/dev/vme/xd.c @@ -1,4 +1,4 @@ -/* $NetBSD: xd.c,v 1.83 2009/03/18 17:06:51 cegger Exp $ */ +/* $NetBSD: xd.c,v 1.84 2009/04/18 14:58:04 tsutsui Exp $ */ /* * @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.83 2009/03/18 17:06:51 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.84 2009/04/18 14:58:04 tsutsui Exp $"); #undef XDC_DEBUG /* full debug */ #define XDC_DIAG /* extra sanity checks */ @@ -329,7 +329,7 @@ xddummystrat(struct buf *bp) { if (bp->b_bcount != XDFM_BPS) panic("xddummystrat"); - memcpy( bp->b_data, xd_labeldata, XDFM_BPS); + memcpy(bp->b_data, xd_labeldata, XDFM_BPS); bp->b_oflags |= BO_DONE; bp->b_cflags &= ~BC_BUSY; } @@ -889,7 +889,7 @@ xdattach(parent, self, aux) if (lcv != 126) { aprint_error_dev(&xd->sc_dev, "warning: invalid bad144 sector!\n"); } else { - memcpy( &xd->dkb, buf, XDFM_BPS); + memcpy(&xd->dkb, buf, XDFM_BPS); } done: @@ -1040,12 +1040,12 @@ xdioctl(dev, command, addr, flag, l) if ((flag & FWRITE) == 0) return EBADF; s = splbio(); - memcpy( &xd->dkb, addr, sizeof(xd->dkb)); + memcpy(&xd->dkb, addr, sizeof(xd->dkb)); splx(s); return 0; case DIOCGDINFO: /* get disk label */ - memcpy( addr, xd->sc_dk.dk_label, sizeof(struct disklabel)); + memcpy(addr, xd->sc_dk.dk_label, sizeof(struct disklabel)); return 0; #ifdef __HAVE_OLD_DISKLABEL case ODIOCGDINFO: @@ -1851,7 +1851,7 @@ xdc_xdreset(xdcsc, xdsc) struct xd_iopb tmpiopb; u_long addr; int del; - memcpy( &tmpiopb, xdcsc->iopbase, sizeof(tmpiopb)); + memcpy(&tmpiopb, xdcsc->iopbase, sizeof(tmpiopb)); memset(xdcsc->iopbase, 0, sizeof(tmpiopb)); xdcsc->iopbase->comm = XDCMD_RST; xdcsc->iopbase->unit = xdsc->xd_drive; @@ -1868,7 +1868,7 @@ xdc_xdreset(xdcsc, xdsc) } else { xdcsc->xdc->xdc_csr = XDC_CLRRIO; /* clear RIO */ } - memcpy( xdcsc->iopbase, &tmpiopb, sizeof(tmpiopb)); + memcpy(xdcsc->iopbase, &tmpiopb, sizeof(tmpiopb)); } @@ -2293,8 +2293,8 @@ xdc_tick(arg) nrun = xdcsc->nrun; nfree = xdcsc->nfree; ndone = xdcsc->ndone; - memcpy( wqc, xdcsc->waitq, sizeof(wqc)); - memcpy( fqc, xdcsc->freereq, sizeof(fqc)); + memcpy(wqc, xdcsc->waitq, sizeof(wqc)); + memcpy(fqc, xdcsc->freereq, sizeof(fqc)); splx(s); if (nwait + nrun + nfree + ndone != XDC_MAXIOPB) { printf("%s: diag: IOPB miscount (got w/f/r/d %d/%d/%d/%d, wanted %d)\n", diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c index 582a46c2bbf..6486c55ba3b 100644 --- a/sys/dev/vme/xy.c +++ b/sys/dev/vme/xy.c @@ -1,4 +1,4 @@ -/* $NetBSD: xy.c,v 1.87 2009/03/18 17:06:51 cegger Exp $ */ +/* $NetBSD: xy.c,v 1.88 2009/04/18 14:58:04 tsutsui Exp $ */ /* * @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.87 2009/03/18 17:06:51 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.88 2009/04/18 14:58:04 tsutsui Exp $"); #undef XYC_DEBUG /* full debug */ #undef XYC_DIAG /* extra sanity checks */ @@ -245,7 +245,7 @@ xydummystrat(struct buf *bp) { if (bp->b_bcount != XYFM_BPS) panic("xydummystrat"); - memcpy( bp->b_data, xy_labeldata, XYFM_BPS); + memcpy(bp->b_data, xy_labeldata, XYFM_BPS); bp->b_oflags |= BO_DONE; bp->b_cflags &= ~BC_BUSY; } @@ -802,7 +802,7 @@ xyattach(parent, self, aux) if (lcv != 126) { aprint_error_dev(&xy->sc_dev, "warning: invalid bad144 sector!\n"); } else { - memcpy( &xy->dkb, buf, XYFM_BPS); + memcpy(&xy->dkb, buf, XYFM_BPS); } done: @@ -963,12 +963,12 @@ xyioctl(dev, command, addr, flag, l) if ((flag & FWRITE) == 0) return EBADF; s = splbio(); - memcpy( &xy->dkb, addr, sizeof(xy->dkb)); + memcpy(&xy->dkb, addr, sizeof(xy->dkb)); splx(s); return 0; case DIOCGDINFO: /* get disk label */ - memcpy( addr, xy->sc_dk.dk_label, sizeof(struct disklabel)); + memcpy(addr, xy->sc_dk.dk_label, sizeof(struct disklabel)); return 0; #ifdef __HAVE_OLD_DISKLABEL case ODIOCGDINFO: @@ -1756,7 +1756,7 @@ xyc_xyreset(xycsc, xysc) iopb = xycsc->ciopb; /* Save contents */ - memcpy( &tmpiopb, iopb, sizeof(struct xy_iopb)); + memcpy(&tmpiopb, iopb, sizeof(struct xy_iopb)); iopb->chen = iopb->done = iopb->errs = 0; iopb->ien = 0; @@ -1784,7 +1784,7 @@ xyc_xyreset(xycsc, xysc) } /* Restore contents */ - memcpy( iopb, &tmpiopb, sizeof(struct xy_iopb)); + memcpy(iopb, &tmpiopb, sizeof(struct xy_iopb)); } |
