Date: Tue, 12 Jun 2007 20:23:37 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 121532 for review Message-ID: <200706122023.l5CKNbVK044263@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=121532 Change 121532 by thompsa@thompsa_heff on 2007/06/12 20:23:26 Catch up with sc->axe_unit removal. Affected files ... .. //depot/projects/wifi/sys/dev/usb/if_axe.c#20 edit Differences ... ==== //depot/projects/wifi/sys/dev/usb/if_axe.c#20 (text+ko) ==== @@ -305,10 +305,10 @@ } } -printf("axe%d: write media 0x%x\n", sc->axe_unit, val);/*XXX*/ +device_printf(sc->axe_dev, "write media 0x%x\n", val);/*XXX*/ err = axe_cmd(sc, AXE_CMD_WRITE_MEDIA, 0, val, NULL); if (err) { - printf("axe%d: media change failed\n", sc->axe_unit); + device_printf(sc->axe_dev, "media change failed\n"); return; } } @@ -734,7 +734,7 @@ /* XXX don't handle multiple packets in one transfer */ if (sc->axe_flags & (AX178|AX772)) { if (total_len < sizeof(hdr)) { -printf("axe%d: total_len %d\n", sc->axe_unit, total_len);/*XXX*/ +device_printf(sc->axe_dev, "total_len %d\n", total_len);/*XXX*/ ifp->if_ierrors++; goto done; } @@ -742,13 +742,13 @@ total_len -= sizeof(hdr); if ((hdr.len ^ hdr.ilen) != 0xffff) { -printf("axe%d: len %d ilen %d\n", sc->axe_unit, hdr.len, hdr.ilen);/*XXX*/ +device_printf(sc->axe_dev, "len %d ilen %d\n", hdr.len, hdr.ilen);/*XXX*/ ifp->if_ierrors++; goto done; } pktlen = le16toh(hdr.len); if (pktlen > total_len) { -printf("axe%d: pktlen %d total_len %d\n", sc->axe_unit, pktlen, total_len);/*XXX*/ +device_printf(sc->axe_dev, "pktlen %d total_len %d\n", pktlen, total_len);/*XXX*/ ifp->if_ierrors++; goto done; } @@ -898,7 +898,7 @@ if (sc->axe_flags & (AX178|AX772)) { hdr.len = htole16(m->m_pkthdr.len); hdr.ilen = -hdr.len; -printf("axe%d: %s len %d\n", sc->axe_unit, __func__, m->m_pkthdr.len); +device_printf(sc->axe_dev, "%s len %d\n", __func__, m->m_pkthdr.len); memcpy(c->ue_buf, &hdr, sizeof(hdr)); m_copydata(m, 0, m->m_pkthdr.len, c->ue_buf + sizeof(hdr)); @@ -908,7 +908,7 @@ if ((length % boundary) == 0) { hdr.len = 0; hdr.ilen = 0xffff; -printf("axe%d: %s add null segment\n", sc->axe_unit, __func__); +device_printf(sc->axe_dev, "%s add null segment\n", __func__); memcpy(c->ue_buf + length, &hdr, sizeof(hdr)); length += sizeof(hdr); } @@ -918,7 +918,7 @@ } c->ue_mbuf = m; -printf("axe%d: %s length %d\n", sc->axe_unit, __func__, length); +device_printf(sc->axe_dev, "%s length %d\n", __func__, length); usbd_setup_xfer(c->ue_xfer, sc->axe_ep[AXE_ENDPT_TX], c, c->ue_buf, length, USBD_FORCE_SHORT_XFER, 10000, axe_txeof);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706122023.l5CKNbVK044263>