Date: Sun, 2 Dec 2007 00:54:36 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 129938 for review Message-ID: <200712020054.lB20saii019146@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=129938 Change 129938 by hselasky@hselasky_laptop001 on 2007/12/02 00:53:55 The "buf_data" field of "struct usbd_xfer" does no longer exist. Replace it: [ -f src/$F ] && (cat src/$F | sed -e "s/[&][(]xfer-[>]buf_data[)]/xfer->frbuffers + 0/g" > temp ) && ((diff -u src/$F temp) || (cat temp > src/$F)) Affected files ... .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#25 edit .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#36 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#37 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#34 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#40 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/uark.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/ubser.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/udbp.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/ugensa.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#12 edit .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/umass.c#33 edit .. //depot/projects/usb/src/sys/dev/usb/umct.c#23 edit .. //depot/projects/usb/src/sys/dev/usb/umodem.c#32 edit .. //depot/projects/usb/src/sys/dev/usb/umoscom.c#10 edit .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#30 edit .. //depot/projects/usb/src/sys/dev/usb/urio.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#29 edit Differences ... ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#25 (text) ==== @@ -582,7 +582,7 @@ bzero(sc->cbw.cdb, 16); bcopy(request->u.atapi.ccb, sc->cbw.cdb, 12); /* XXX SOS */ - usbd_copy_in(&(xfer->buf_data), 0, &(sc->cbw), sizeof(sc->cbw)); + usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->cbw), sizeof(sc->cbw)); xfer->frlengths[0] = sizeof(sc->cbw); usbd_start_hardware(xfer); @@ -605,7 +605,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - usbd_copy_out(&(xfer->buf_data), 0, + usbd_copy_out(xfer->frbuffers + 0, 0, sc->ata_data, xfer->actlen); sc->ata_bytecount -= xfer->actlen; @@ -683,7 +683,7 @@ xfer->timeout = sc->timeout; xfer->frlengths[0] = max_bulk; - usbd_copy_in(&(xfer->buf_data), 0, + usbd_copy_in(xfer->frbuffers + 0, 0, sc->ata_data, max_bulk); usbd_start_hardware(xfer); @@ -721,7 +721,7 @@ if (xfer->actlen < sizeof(sc->csw)) { bzero(&(sc->csw), sizeof(sc->csw)); } - usbd_copy_out(&(xfer->buf_data), 0, &(sc->csw), xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->csw), xfer->actlen); if (request->flags & (ATA_R_READ | ATA_R_WRITE)) { request->donecount = sc->ata_donecount; ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#23 (text+ko) ==== @@ -3276,14 +3276,14 @@ while (xfer->actlen >= 4) { - usbd_copy_out(&(xfer->buf_data), pos, buf, 1); + usbd_copy_out(xfer->frbuffers + 0, pos, buf, 1); cmd_len = umidi_cmd_to_len[buf[0] & 0xF]; /* command length */ cn = buf[0] >> 4; /* cable number */ sub = &(chan->sub[cn]); if (cmd_len && (cn < chan->max_cable) && sub->read_open) { - usb_cdev_put_data(&(sub->cdev), &(xfer->buf_data), + usb_cdev_put_data(&(sub->cdev), xfer->frbuffers + 0, pos + 1, cmd_len, 1); } else { /* ignore the command */ @@ -3502,14 +3502,14 @@ sub = &(chan->sub[chan->curr_cable]); if (sub->write_open) { - usb_cdev_get_data(&(sub->cdev), &(xfer->buf_data), + usb_cdev_get_data(&(sub->cdev), xfer->frbuffers + 0, total_length, 1, &actlen, 0); } else { actlen = 0; } if (actlen) { - usbd_copy_out(&(xfer->buf_data), total_length, &buf, 1); + usbd_copy_out(xfer->frbuffers + 0, total_length, &buf, 1); tr_any = 1; @@ -3521,7 +3521,7 @@ sub->temp_cmd[0], sub->temp_cmd[1], sub->temp_cmd[2], sub->temp_cmd[3]); - usbd_copy_in(&(xfer->buf_data), total_length, + usbd_copy_in(xfer->frbuffers + 0, total_length, sub->temp_cmd, 4); total_length += 4; ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#36 (text+ko) ==== @@ -1000,7 +1000,7 @@ if (ifp && (ifp->if_drv_flags & IFF_DRV_RUNNING) && (xfer->actlen >= sizeof(pkt))) { - usbd_copy_out(&(xfer->buf_data), 0, &pkt, sizeof(pkt)); + usbd_copy_out(xfer->frbuffers + 0, 0, &pkt, sizeof(pkt)); if (pkt.aue_txstat0) { ifp->if_oerrors++; @@ -1066,7 +1066,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), xfer->actlen - 4, &(sc->sc_rxpkt), + usbd_copy_out(xfer->frbuffers + 0, xfer->actlen - 4, &(sc->sc_rxpkt), sizeof(sc->sc_rxpkt)); /* @@ -1091,7 +1091,7 @@ } xfer->actlen = min(xfer->actlen, m->m_len); - usbd_copy_out(&(xfer->buf_data), 0, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -1184,7 +1184,7 @@ xfer->frlengths[0] = m->m_pkthdr.len; - usbd_m_copy_in(&(xfer->buf_data), 0, + usbd_m_copy_in(xfer->frbuffers + 0, 0, m, 0, m->m_pkthdr.len); } else { @@ -1200,9 +1200,9 @@ buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usbd_copy_in(&(xfer->buf_data), 0, buf, 2); + usbd_copy_in(xfer->frbuffers + 0, 0, buf, 2); - usbd_m_copy_in(&(xfer->buf_data), 2, + usbd_m_copy_in(xfer->frbuffers + 0, 2, m, 0, m->m_pkthdr.len); } ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#37 (text+ko) ==== @@ -1035,7 +1035,7 @@ /* too little data */ break; } - usbd_copy_out(&(xfer->buf_data), pos, &hdr, sizeof(hdr)); + usbd_copy_out(xfer->frbuffers + 0, pos, &hdr, sizeof(hdr)); if ((hdr.len ^ hdr.ilen) != 0xFFFF) { /* we lost sync */ @@ -1068,7 +1068,7 @@ if (m->m_len > len) { m->m_len = len; } - usbd_copy_out(&(xfer->buf_data), pos, m->m_data, m->m_len); + usbd_copy_out(xfer->frbuffers + 0, pos, m->m_data, m->m_len); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -1204,7 +1204,7 @@ hdr.len = htole16(m->m_pkthdr.len); hdr.ilen = ~hdr.len; - usbd_copy_in(&(xfer->buf_data), pos, &hdr, sizeof(hdr)); + usbd_copy_in(xfer->frbuffers + 0, pos, &hdr, sizeof(hdr)); pos += sizeof(hdr); @@ -1216,7 +1216,7 @@ * USBD_FORCE_SHORT_XFER flag instead. */ } - usbd_m_copy_in(&(xfer->buf_data), pos, + usbd_m_copy_in(xfer->frbuffers + 0, pos, m, 0, m->m_pkthdr.len); pos += m->m_pkthdr.len; ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#29 (text+ko) ==== @@ -509,7 +509,7 @@ } xfer->frlengths[0] = m->m_pkthdr.len; - usbd_m_copy_in(&(xfer->buf_data), 0, + usbd_m_copy_in(xfer->frbuffers + 0, 0, m, 0, m->m_pkthdr.len); if (sc->sc_flags & CDCE_FLAG_ZAURUS) { @@ -517,7 +517,7 @@ crc = htole32(cdce_m_crc32(m, 0, m->m_pkthdr.len)); - usbd_copy_in(&(xfer->buf_data), + usbd_copy_in(xfer->frbuffers + 0, m->m_pkthdr.len, &crc, 4); xfer->frlengths[0] += 4; @@ -718,7 +718,7 @@ } xfer->actlen = min(xfer->actlen, m->m_len); - usbd_copy_out(&(xfer->buf_data), 0, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#32 (text+ko) ==== @@ -648,7 +648,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, 2); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, 2); len = buf[0] | (buf[1] << 8); @@ -663,7 +663,7 @@ xfer->actlen = min(xfer->actlen, m->m_len); xfer->actlen = min(xfer->actlen, len); - usbd_copy_out(&(xfer->buf_data), 2, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 2, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -806,9 +806,9 @@ buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usbd_copy_in(&(xfer->buf_data), 0, buf, 2); + usbd_copy_in(xfer->frbuffers + 0, 0, buf, 2); - usbd_m_copy_in(&(xfer->buf_data), 2, + usbd_m_copy_in(xfer->frbuffers + 0, 2, m, 0, m->m_pkthdr.len); /* ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#34 (text+ko) ==== @@ -686,7 +686,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, 2); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, 2); len = buf[0] | (buf[1] << 8); @@ -701,7 +701,7 @@ xfer->actlen = min(xfer->actlen, m->m_len); xfer->actlen = min(xfer->actlen, len); - usbd_copy_out(&(xfer->buf_data), 2, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 2, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -794,12 +794,12 @@ buf[0] = (uint8_t)(m->m_pkthdr.len); buf[1] = (uint8_t)(m->m_pkthdr.len >> 8); - usbd_copy_in(&(xfer->buf_data), 0, buf, 2); + usbd_copy_in(xfer->frbuffers + 0, 0, buf, 2); - usbd_m_copy_in(&(xfer->buf_data), 2, + usbd_m_copy_in(xfer->frbuffers + 0, 2, m, 0, m->m_pkthdr.len); - usbd_bzero(&(xfer->buf_data), temp_len, + usbd_bzero(xfer->frbuffers + 0, temp_len, total_len - temp_len); xfer->frlengths[0] = total_len; ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#32 (text+ko) ==== @@ -896,7 +896,7 @@ if (ifp && (ifp->if_drv_flags & IFF_DRV_RUNNING) && (xfer->actlen >= sizeof(pkt))) { - usbd_copy_out(&(xfer->buf_data), 0, &pkt, sizeof(pkt)); + usbd_copy_out(xfer->frbuffers + 0, 0, &pkt, sizeof(pkt)); ifp->if_ierrors += pkt.rue_rxlost_cnt; ifp->if_ierrors += pkt.rue_crcerr_cnt; @@ -950,7 +950,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), xfer->actlen - 4, + usbd_copy_out(xfer->frbuffers + 0, xfer->actlen - 4, &status, sizeof(status)); status = le16toh(status); @@ -975,7 +975,7 @@ } xfer->actlen = min(xfer->actlen, m->m_len); - usbd_copy_out(&(xfer->buf_data), 0, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; @@ -1066,7 +1066,7 @@ } temp_len = m->m_pkthdr.len; - usbd_m_copy_in(&(xfer->buf_data), 0, + usbd_m_copy_in(xfer->frbuffers + 0, 0, m, 0, m->m_pkthdr.len); /* @@ -1075,7 +1075,7 @@ * RUE_MIN_FRAMELEN (60) byte packet. */ if (temp_len < RUE_MIN_FRAMELEN) { - usbd_bzero(&(xfer->buf_data), temp_len, + usbd_bzero(xfer->frbuffers + 0, temp_len, RUE_MIN_FRAMELEN - temp_len); temp_len = RUE_MIN_FRAMELEN; } ==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#16 (text+ko) ==== @@ -1044,7 +1044,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, + usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->sc_rx_desc), RT2573_RX_DESC_SIZE); flags = le32toh(sc->sc_rx_desc.flags); @@ -1068,7 +1068,7 @@ } max_len = (xfer->actlen - RT2573_RX_DESC_SIZE); - usbd_copy_out(&(xfer->buf_data), RT2573_RX_DESC_SIZE, + usbd_copy_out(xfer->frbuffers + 0, RT2573_RX_DESC_SIZE, m->m_data, max_len); /* finalize mbuf */ @@ -1338,10 +1338,10 @@ } rum_setup_tx_desc(sc, flags, 0, m->m_pkthdr.len, rate); - usbd_copy_in(&(xfer->buf_data), 0, &(sc->sc_tx_desc), + usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->sc_tx_desc), RT2573_TX_DESC_SIZE); - usbd_m_copy_in(&(xfer->buf_data), RT2573_TX_DESC_SIZE, + usbd_m_copy_in(xfer->frbuffers + 0, RT2573_TX_DESC_SIZE, m, 0, m->m_pkthdr.len); /* compute transfer length */ @@ -1351,13 +1351,13 @@ if (temp_len & 3) { align = (-(temp_len)) & 3; /* zero the extra byte(s) */ - usbd_bzero(&(xfer->buf_data), temp_len, align); + usbd_bzero(xfer->frbuffers + 0, temp_len, align); temp_len += align; } /* check if we need to add four extra bytes */ if ((temp_len % 64) == 0) { /* zero the extra bytes */ - usbd_bzero(&(xfer->buf_data), temp_len, 4); + usbd_bzero(xfer->frbuffers + 0, temp_len, 4); temp_len += 4; } DPRINTF(sc, 10, "sending frame len=%u rate=%u xferlen=%u\n", ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#33 (text+ko) ==== @@ -918,13 +918,13 @@ temp_len += 2; - usbd_copy_in(&(xfer->buf_data), 0, buf, 2); + usbd_copy_in(xfer->frbuffers + 0, 0, buf, 2); - usbd_m_copy_in(&(xfer->buf_data), 2, + usbd_m_copy_in(xfer->frbuffers + 0, 2, m, 0, m->m_pkthdr.len); if (extra_len) { - usbd_bzero(&(xfer->buf_data), temp_len - extra_len, + usbd_bzero(xfer->frbuffers + 0, temp_len - extra_len, extra_len); } /* @@ -988,7 +988,7 @@ } xfer->actlen -= 1; - usbd_copy_out(&(xfer->buf_data), 0, &status, 1); + usbd_copy_out(xfer->frbuffers + 0, 0, &status, 1); if (status & UDAV_RSR_LCS) { ifp->if_collisions++; @@ -998,7 +998,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 1, &total_len, 2); + usbd_copy_out(xfer->frbuffers + 0, 1, &total_len, 2); total_len = le16toh(total_len); @@ -1020,7 +1020,7 @@ } xfer->actlen = min(xfer->actlen, m->m_len); - usbd_copy_out(&(xfer->buf_data), 3, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 3, m->m_data, xfer->actlen); ifp->if_ipackets++; m->m_pkthdr.rcvif = ifp; ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#40 (text+ko) ==== @@ -1113,7 +1113,7 @@ } max_len = (xfer->actlen - RAL_RX_DESC_SIZE); - usbd_copy_out(&(xfer->buf_data), max_len, + usbd_copy_out(xfer->frbuffers + 0, max_len, &(sc->sc_rx_desc), RAL_RX_DESC_SIZE); flags = le32toh(sc->sc_rx_desc.flags); @@ -1149,7 +1149,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, m->m_data, max_len); + usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, max_len); /* finalize mbuf */ m->m_pkthdr.rcvif = ifp; @@ -1422,10 +1422,10 @@ } ural_setup_tx_desc(sc, flags, m->m_pkthdr.len, rate); - usbd_copy_in(&(xfer->buf_data), 0, &(sc->sc_tx_desc), + usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->sc_tx_desc), RAL_TX_DESC_SIZE); - usbd_m_copy_in(&(xfer->buf_data), RAL_TX_DESC_SIZE, + usbd_m_copy_in(xfer->frbuffers + 0, RAL_TX_DESC_SIZE, m, 0, m->m_pkthdr.len); /* compute transfer length */ @@ -1434,13 +1434,13 @@ /* make transfer length 16-bit aligned */ if (temp_len & 1) { /* zero the extra byte */ - usbd_bzero(&(xfer->buf_data), temp_len, 1); + usbd_bzero(xfer->frbuffers + 0, temp_len, 1); temp_len++; } /* check if we need to add two extra bytes */ if ((temp_len % 64) == 0) { /* zero the extra bytes */ - usbd_bzero(&(xfer->buf_data), temp_len, 2); + usbd_bzero(xfer->frbuffers + 0, temp_len, 2); temp_len += 2; } DPRINTF(sc, 10, "sending frame len=%u rate=%u xferlen=%u\n", @@ -1496,7 +1496,7 @@ if (sc->sc_flags & URAL_FLAG_SEND_BYTE_FRAME) { sc->sc_flags &= ~URAL_FLAG_SEND_BYTE_FRAME; - usbd_bzero(&(xfer->buf_data), 0, 1); + usbd_bzero(xfer->frbuffers + 0, 0, 1); xfer->frlengths[0] = 1; /* bytes */ ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#22 (text+ko) ==== @@ -472,7 +472,7 @@ if (xfer->actlen > sizeof(sc->sc_intr_ibuf)) { xfer->actlen = sizeof(sc->sc_intr_ibuf); } - usbd_copy_out(&(xfer->buf_data), 0, &(sc->sc_intr_ibuf), + usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->sc_intr_ibuf), xfer->actlen); goto wakeup; @@ -569,7 +569,7 @@ goto wakeup; } if (sc->sc_intr_owakeup) { - usbd_copy_in(&(xfer->buf_data), 0, &(sc->sc_intr_obuf), + usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->sc_intr_obuf), sc->sc_intr_olen); xfer->frlengths[0] = sc->sc_intr_olen; @@ -959,10 +959,10 @@ goto done; } /* copy out data */ - usbd_copy_out(&(xfer->buf_data), offset, m->m_data, len); + usbd_copy_out(xfer->frbuffers + 0, offset, m->m_data, len); /* copy out status report */ - usbd_copy_out(&(xfer->buf_data), offset + len, &desc, sizeof(desc)); + usbd_copy_out(xfer->frbuffers + 0, offset + len, &desc, sizeof(desc)); /* * TODO: Signal strength and quality have to be calculated in @@ -1055,7 +1055,7 @@ ifp->if_ierrors++; goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), xfer->actlen - sizeof(info), + usbd_copy_out(xfer->frbuffers + 0, xfer->actlen - sizeof(info), &info, sizeof(info)); /* See whether this is a multi-frame tansmission */ @@ -2599,7 +2599,7 @@ desc.packetlength, desc.currentlength, desc.service, desc.nextframelen); - usbd_copy_in(&(xfer->buf_data), 0, &desc, sizeof(desc)); + usbd_copy_in(xfer->frbuffers + 0, 0, &desc, sizeof(desc)); return; } @@ -2651,14 +2651,14 @@ } zyd_setup_tx_desc(xfer, m0, rate); - usbd_m_copy_in(&(xfer->buf_data), sizeof(struct zyd_controlsetformat), + usbd_m_copy_in(xfer->frbuffers + 0, sizeof(struct zyd_controlsetformat), m0, 0, m0->m_pkthdr.len); temp_len = (sizeof(struct zyd_controlsetformat) + m0->m_pkthdr.len); /* xfer length needs to be a multiple of two! */ if (temp_len & 1) { - usbd_bzero(&(xfer->buf_data), temp_len, 1); + usbd_bzero(xfer->frbuffers + 0, temp_len, 1); temp_len++; } DPRINTF(sc, 0, "len=%u rate=%u xfer len=%u\n", ==== //depot/projects/usb/src/sys/dev/usb/uark.c#12 (text+ko) ==== @@ -265,7 +265,7 @@ usbd_transfer_start(sc->sc_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, UARK_BUF_SIZE, &actlen)) { xfer->frlengths[0] = actlen; usbd_start_hardware(xfer); @@ -303,7 +303,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, xfer->actlen); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#29 (text+ko) ==== @@ -641,7 +641,7 @@ usbd_transfer_start(sc->sc_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, UBSA_BSIZE, &actlen)) { xfer->frlengths[0] = actlen; @@ -680,7 +680,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(&(sc->sc_ucom), &(xfer->buf_data), 0, xfer->actlen); + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, xfer->actlen); case USBD_ST_SETUP: if (sc->sc_flag & UBSA_FLAG_READ_STALL) { @@ -726,7 +726,7 @@ if (xfer->actlen >= sizeof(buf)) { - usbd_copy_out(&(xfer->buf_data), 0, buf, sizeof(buf)); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, sizeof(buf)); /* * incidentally, Belkin adapter status bits match ==== //depot/projects/usb/src/sys/dev/usb/ubser.c#21 (text+ko) ==== @@ -452,12 +452,12 @@ } do { if (ucom_get_data(sc->sc_ucom + sc->sc_curr_tx_unit, - &(xfer->buf_data), 1, sc->sc_tx_size - 1, + xfer->frbuffers + 0, 1, sc->sc_tx_size - 1, &actlen)) { buf[0] = sc->sc_curr_tx_unit; - usbd_copy_in(&(xfer->buf_data), 0, buf, 1); + usbd_copy_in(xfer->frbuffers + 0, 0, buf, 1); xfer->frlengths[0] = actlen + 1; usbd_start_hardware(xfer); @@ -508,14 +508,14 @@ DPRINTF(sc, 0, "invalid actlen=0!\n"); goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, 1); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, 1); if (buf[0] >= sc->sc_numser) { DPRINTF(sc, 0, "invalid serial number!\n"); goto tr_setup; } ucom_put_data(sc->sc_ucom + buf[0], - &(xfer->buf_data), 1, xfer->actlen - 1); + xfer->frbuffers + 0, 1, xfer->actlen - 1); case USBD_ST_SETUP: tr_setup: ==== //depot/projects/usb/src/sys/dev/usb/ucycom.c#23 (text+ko) ==== @@ -580,7 +580,7 @@ if (xfer->actlen < 1) { goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, 1); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, 1); sc->sc_ist = buf[0] & ~0x07; len = buf[0] & 0x07; @@ -595,7 +595,7 @@ if (xfer->actlen < 2) { goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, 2); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, 2); sc->sc_ist = buf[0] & ~0x07; len = buf[1]; @@ -615,7 +615,7 @@ len = xfer->actlen; } if (len) { - ucom_put_data(&(sc->sc_ucom), &(xfer->buf_data), + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, offset, len); } case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/udbp.c#18 (text+ko) ==== @@ -430,7 +430,7 @@ } m->m_pkthdr.len = m->m_len = xfer->actlen; - usbd_copy_out(&(xfer->buf_data), 0, m->m_data, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, m->m_data, xfer->actlen); sc->sc_bulk_in_buffer = m; @@ -550,7 +550,7 @@ MCLBYTES); m->m_pkthdr.len = MCLBYTES; } - usbd_m_copy_in(&(xfer->buf_data), 0, m, 0, m->m_pkthdr.len); + usbd_m_copy_in(xfer->frbuffers + 0, 0, m, 0, m->m_pkthdr.len); xfer->frlengths[0] = m->m_pkthdr.len; ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#29 (text+ko) ==== @@ -692,7 +692,7 @@ DPRINTF(sc, 0, "truncating message\n"); xfer->actlen = sizeof(pkt); } - usbd_copy_out(&(xfer->buf_data), 0, &pkt, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, &pkt, xfer->actlen); xfer->actlen -= 8; @@ -797,7 +797,7 @@ usbd_transfer_start(sc->sc_bulk_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, UFOMA_BULK_BUF_SIZE, &actlen)) { xfer->frlengths[0] = actlen; usbd_start_hardware(xfer); @@ -835,7 +835,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, xfer->actlen); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#26 (text+ko) ==== @@ -541,14 +541,14 @@ usbd_transfer_start(sc->sc_xfer[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), &(xfer->buf_data), + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, sc->sc_hdrlen, UFTDI_OBUFSIZE - sc->sc_hdrlen, &actlen)) { if (sc->sc_hdrlen > 0) { buf[0] = FTDI_OUT_TAG(actlen, sc->sc_ucom.sc_portno); - usbd_copy_in(&(xfer->buf_data), 0, buf, 1); + usbd_copy_in(xfer->frbuffers + 0, 0, buf, 1); } xfer->frlengths[0] = actlen + sc->sc_hdrlen; usbd_start_hardware(xfer); @@ -593,7 +593,7 @@ if (xfer->actlen < 2) { goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, 2); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, 2); msr = FTDI_GET_MSR(buf); lsr = FTDI_GET_LSR(buf); @@ -612,7 +612,7 @@ xfer->actlen -= 2; if (xfer->actlen > 0) { - ucom_put_data(&(sc->sc_ucom), &(xfer->buf_data), 2, + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 2, xfer->actlen); } case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#28 (text+ko) ==== @@ -1301,7 +1301,7 @@ if (ptr == NULL) { PRINTFN(5, ("dropping one packet, sce=%p\n", sce)); } else { - usbd_copy_out(&(xfer->buf_data), 0, ptr, xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, ptr, xfer->actlen); if (xfer->actlen > *plen) { xfer->actlen = *plen; ==== //depot/projects/usb/src/sys/dev/usb/ugensa.c#14 (text+ko) ==== @@ -295,7 +295,7 @@ usbd_transfer_start(ssc->sc_xfer[2]); return; } - if (ucom_get_data(ssc->sc_ucom_ptr, &(xfer->buf_data), 0, + if (ucom_get_data(ssc->sc_ucom_ptr, xfer->frbuffers + 0, 0, UGENSA_BUF_SIZE, &actlen)) { xfer->frlengths[0] = actlen; usbd_start_hardware(xfer); @@ -333,7 +333,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(ssc->sc_ucom_ptr, &(xfer->buf_data), 0, + ucom_put_data(ssc->sc_ucom_ptr, xfer->frbuffers + 0, 0, xfer->actlen); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/uhid.c#23 (text+ko) ==== @@ -147,7 +147,7 @@ DPRINTF(0, "transferred!\n"); if (xfer->actlen >= sc->sc_isize) { - usb_cdev_put_data(&(sc->sc_cdev), &(xfer->buf_data), + usb_cdev_put_data(&(sc->sc_cdev), xfer->frbuffers + 0, 0, sc->sc_isize, 1); } else { /* ignore it */ @@ -207,12 +207,12 @@ /* try to extract the ID byte */ if (sc->sc_oid) { - if (usb_cdev_get_data(&(sc->sc_cdev), &(xfer->buf_data), + if (usb_cdev_get_data(&(sc->sc_cdev), xfer->frbuffers + 0, 0, 1, &actlen, 0)) { if (actlen != 1) { goto tr_error; } - usbd_copy_out(&(xfer->buf_data), 0, &id, 1); + usbd_copy_out(xfer->frbuffers + 0, 0, &id, 1); } else { return; @@ -258,7 +258,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - usb_cdev_put_data(&(sc->sc_cdev), &(xfer->buf_data), + usb_cdev_put_data(&(sc->sc_cdev), xfer->frbuffers + 0, sizeof(req), sc->sc_isize, 1); return; ==== //depot/projects/usb/src/sys/dev/usb/uipaq.c#12 (text+ko) ==== @@ -409,7 +409,7 @@ usbd_transfer_start(sc->sc_xfer_data[2]); return; } - if (ucom_get_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, UIPAQ_BUF_SIZE, &actlen)) { xfer->frlengths[0] = actlen; @@ -448,7 +448,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - ucom_put_data(&(sc->sc_ucom), &(xfer->buf_data), 0, + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, xfer->actlen); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#29 (text+ko) ==== @@ -465,7 +465,7 @@ } if (len) { bzero(&(sc->sc_ndata), sizeof(sc->sc_ndata)); - usbd_copy_out(&(xfer->buf_data), 0, &(sc->sc_ndata), len); + usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->sc_ndata), len); #ifdef USB_DEBUG if (sc->sc_ndata.modifiers) { DPRINTF(0, "mod: 0x%04x\n", sc->sc_ndata.modifiers); ==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#32 (text+ko) ==== @@ -128,7 +128,7 @@ usbd_transfer_start(sc->sc_xfer[4]); return; } - if (usb_cdev_get_data(&(sc->sc_cdev), &(xfer->buf_data), 0, + if (usb_cdev_get_data(&(sc->sc_cdev), xfer->frbuffers + 0, 0, xfer->max_data_length, &actlen, 0)) { xfer->frlengths[0] = actlen; @@ -184,7 +184,7 @@ sc->sc_zlps = 0; } - usb_cdev_put_data(&(sc->sc_cdev), &(xfer->buf_data), 0, + usb_cdev_put_data(&(sc->sc_cdev), xfer->frbuffers + 0, 0, xfer->actlen, 1); case USBD_ST_SETUP: ==== //depot/projects/usb/src/sys/dev/usb/umass.c#33 (text+ko) ==== @@ -1878,7 +1878,7 @@ DIF(UDMASS_BBB, umass_bbb_dump_cbw(sc, &sc->cbw)); - usbd_copy_in(&(xfer->buf_data), 0, &(sc->cbw), sizeof(sc->cbw)); + usbd_copy_in(xfer->frbuffers + 0, 0, &(sc->cbw), sizeof(sc->cbw)); xfer->frlengths[0] = sizeof(sc->cbw); usbd_start_hardware(xfer); @@ -1901,7 +1901,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: if (!xfer->flags.bdma_enable) { - usbd_copy_out(&(xfer->buf_data), 0, + usbd_copy_out(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, xfer->actlen); } sc->sc_transfer.data_rem -= xfer->actlen; @@ -1986,7 +1986,7 @@ usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, max_bulk, 0); } else { - usbd_copy_in(&(xfer->buf_data), 0, + usbd_copy_in(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, max_bulk); } @@ -2032,7 +2032,7 @@ if (xfer->actlen < sizeof(sc->csw)) { bzero(&(sc->csw), sizeof(sc->csw)); } - usbd_copy_out(&(xfer->buf_data), 0, &(sc->csw), xfer->actlen); + usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->csw), xfer->actlen); DIF(UDMASS_BBB, umass_bbb_dump_csw(sc, &(sc->csw))); @@ -2404,7 +2404,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: if (!xfer->flags.bdma_enable) { - usbd_copy_out(&(xfer->buf_data), 0, + usbd_copy_out(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, xfer->actlen); } sc->sc_transfer.data_rem -= xfer->actlen; @@ -2485,7 +2485,7 @@ usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, max_bulk, 0); } else { - usbd_copy_in(&(xfer->buf_data), 0, + usbd_copy_in(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, max_bulk); } @@ -2527,7 +2527,7 @@ if (xfer->actlen < sizeof(sc->sbl)) { goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, &(sc->sbl), sizeof(sc->sbl)); + usbd_copy_out(xfer->frbuffers + 0, 0, &(sc->sbl), sizeof(sc->sbl)); residue = (sc->sc_transfer.data_len - sc->sc_transfer.actlen); ==== //depot/projects/usb/src/sys/dev/usb/umct.c#23 (text+ko) ==== @@ -411,7 +411,7 @@ DPRINTF(sc, 0, "too short message\n"); goto tr_setup; } - usbd_copy_out(&(xfer->buf_data), 0, buf, sizeof(buf)); + usbd_copy_out(xfer->frbuffers + 0, 0, buf, sizeof(buf)); sc->sc_msr = buf[0]; sc->sc_lsr = buf[1]; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712020054.lB20saii019146>