diff options
author | hselasky <hselasky@FreeBSD.org> | 2015-11-03 09:38:39 +0000 |
---|---|---|
committer | hselasky <hselasky@FreeBSD.org> | 2015-11-03 09:38:39 +0000 |
commit | fbaec8a8151eb3020765b82719da968af76c6c48 (patch) | |
tree | 2d385673244fc498aa11ac21411865b19ee60dc4 | |
parent | e270febfd581548fe05785e11c6563f611b3430d (diff) | |
download | FreeBSD-src-fbaec8a8151eb3020765b82719da968af76c6c48.zip FreeBSD-src-fbaec8a8151eb3020765b82719da968af76c6c48.tar.gz |
Revert r290327. The compiler warnings seems to be specific to clang v3.5 only.
-rw-r--r-- | sys/dev/usb/usb_msctest.c | 5 | ||||
-rw-r--r-- | sys/dev/usb/wlan/if_zyd.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/usb/usb_msctest.c b/sys/dev/usb/usb_msctest.c index 3b6a29c..b99fd29 100644 --- a/sys/dev/usb/usb_msctest.c +++ b/sys/dev/usb/usb_msctest.c @@ -549,8 +549,7 @@ bbb_command_start(struct bbb_transfer *sc, uint8_t dir, uint8_t lun, sc->cmd_len = cmd_len; memset(&sc->cbw->CBWCDB, 0, sizeof(sc->cbw->CBWCDB)); memcpy(&sc->cbw->CBWCDB, cmd_ptr, cmd_len); - DPRINTFN(1, "SCSI cmd = %*D\n", (int)cmd_len, - (unsigned char *)sc->cbw->CBWCDB, ":"); + DPRINTFN(1, "SCSI cmd = %*D\n", (int)cmd_len, (char *)sc->cbw->CBWCDB, ":"); mtx_lock(&sc->mtx); usbd_transfer_start(sc->xfer[sc->state]); @@ -581,7 +580,7 @@ bbb_raw_write(struct bbb_transfer *sc, const void *data_ptr, size_t data_len, sc->error = 0; DPRINTFN(1, "BULK DATA = %*D\n", (int)data_len, - (const unsigned char *)data_ptr, ":"); + (const char *)data_ptr, ":"); mtx_lock(&sc->mtx); usbd_transfer_start(sc->xfer[0]); diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c index 7fd1d6a..dc7a87f 100644 --- a/sys/dev/usb/wlan/if_zyd.c +++ b/sys/dev/usb/wlan/if_zyd.c @@ -703,14 +703,14 @@ zyd_intr_read_callback(struct usb_xfer *xfer, usb_error_t error) memcpy(rqp->odata, cmd->data, rqp->olen); DPRINTF(sc, ZYD_DEBUG_CMD, "command %p complete, data = %*D \n", - rqp, rqp->olen, (unsigned char *)rqp->odata, ":"); + rqp, rqp->olen, (char *)rqp->odata, ":"); wakeup(rqp); /* wakeup caller */ break; } if (rqp == NULL) { device_printf(sc->sc_dev, "unexpected IORD notification %*D\n", - datalen, (unsigned char *)cmd->data, ":"); + datalen, cmd->data, ":"); } break; } @@ -802,7 +802,7 @@ zyd_cmd(struct zyd_softc *sc, uint16_t code, const void *idata, int ilen, cmd.code = htole16(code); memcpy(cmd.data, idata, ilen); DPRINTF(sc, ZYD_DEBUG_CMD, "sending cmd %p = %*D\n", - &rq, ilen, (unsigned char *)idata, ":"); + &rq, ilen, idata, ":"); rq.cmd = &cmd; rq.idata = idata; |