Date: Sun, 30 Dec 2007 15:51:21 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 132108 for review Message-ID: <200712301551.lBUFpL5j019872@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=132108 Change 132108 by hselasky@hselasky_laptop001 on 2007/12/30 15:50:30 Fix "uchcom" header files. Substitute "DPRINTF" by "DPRINTFN". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#15 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#15 (text+ko) ==== @@ -72,24 +72,17 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/malloc.h> -#include <sys/module.h> -#include <sys/conf.h> -#include <sys/tty.h> -#include <sys/file.h> -#include <sys/select.h> -#include <sys/proc.h> -#include <sys/bus.h> -#include <sys/poll.h> +#include <sys/termios.h> +#include <sys/serial.h> +#include <dev/usb/usb_port.h> #include <dev/usb/usb.h> -#include <dev/usb/usbcdc.h> - -#include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> +#include <dev/usb/usb_subr.h> #include <dev/usb/usb_quirks.h> +#include <dev/usb/usb_cdc.h> #include <dev/usb/ucomvar.h> + #include "usbdevs.h" #ifdef USB_DEBUG @@ -319,7 +312,7 @@ { struct usb_attach_arg *uaa = device_get_ivars(dev); - DPRINTF(10, "\n"); + DPRINTFN(10, "\n"); if (uaa->usb_mode != USB_MODE_HOST) { return (UMATCH_NONE); @@ -341,7 +334,7 @@ int error; uint8_t iface_index; - DPRINTF(10, "\n"); + DPRINTFN(10, "\n"); if (sc == NULL) { return (ENOMEM); @@ -375,7 +368,7 @@ UCHCOM_N_TRANSFER, sc, &Giant); if (error) { - DPRINTF(0, "one or more missing USB endpoints, " + DPRINTFN(0, "one or more missing USB endpoints, " "error=%s\n", usbd_errstr(error)); goto detach; } @@ -412,7 +405,7 @@ { struct uchcom_softc *sc = device_get_softc(dev); - DPRINTF(10, "\n"); + DPRINTFN(10, "\n"); ucom_detach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1); @@ -767,7 +760,7 @@ { struct uchcom_softc *sc = ucom->sc_parent; - DPRINTF(0, "\n"); + DPRINTFN(0, "\n"); *lsr = sc->sc_lsr; *msr = sc->sc_msr; @@ -786,7 +779,7 @@ { struct uchcom_softc *sc = ucom->sc_parent; - DPRINTF(0, "onoff = %d\n", onoff); + DPRINTFN(0, "onoff = %d\n", onoff); sc->sc_dtr = onoff; uchcom_set_dtrrts(sc); @@ -798,7 +791,7 @@ { struct uchcom_softc *sc = ucom->sc_parent; - DPRINTF(0, "onoff = %d\n", onoff); + DPRINTFN(0, "onoff = %d\n", onoff); sc->sc_rts = onoff; uchcom_set_dtrrts(sc); @@ -892,7 +885,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - DPRINTF(0, "actlen = %u\n", xfer->actlen); + DPRINTFN(0, "actlen = %u\n", xfer->actlen); if (xfer->actlen >= UCHCOM_INTR_LEAST) { usbd_copy_out(xfer->frbuffers + 0, 0, buf, @@ -932,7 +925,7 @@ struct usbd_xfer *xfer_other = sc->sc_xfer[4]; if (usbd_clear_stall_callback(xfer, xfer_other)) { - DPRINTF(0, "stall cleared\n"); + DPRINTFN(0, "stall cleared\n"); sc->sc_flag &= ~UCHCOM_FLAG_INTR_STALL; usbd_transfer_start(xfer_other); } @@ -955,7 +948,7 @@ if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, UCHCOM_BULK_BUF_SIZE, &actlen)) { - DPRINTF(0, "actlen = %d\n", actlen); + DPRINTFN(0, "actlen = %d\n", actlen); xfer->frlengths[0] = actlen; usbd_start_hardware(xfer); @@ -979,7 +972,7 @@ struct usbd_xfer *xfer_other = sc->sc_xfer[0]; if (usbd_clear_stall_callback(xfer, xfer_other)) { - DPRINTF(0, "stall cleared\n"); + DPRINTFN(0, "stall cleared\n"); sc->sc_flag &= ~UCHCOM_FLAG_WRITE_STALL; usbd_transfer_start(xfer_other); } @@ -1021,7 +1014,7 @@ struct usbd_xfer *xfer_other = sc->sc_xfer[1]; if (usbd_clear_stall_callback(xfer, xfer_other)) { - DPRINTF(0, "stall cleared\n"); + DPRINTFN(0, "stall cleared\n"); sc->sc_flag &= ~UCHCOM_FLAG_READ_STALL; usbd_transfer_start(xfer_other); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712301551.lBUFpL5j019872>