From owner-p4-projects@FreeBSD.ORG  Sun Dec 30 15:47:17 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 33E9216A46B; Sun, 30 Dec 2007 15:47:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED17616A468
	for <perforce@FreeBSD.org>; Sun, 30 Dec 2007 15:47:16 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DC64913C468
	for <perforce@FreeBSD.org>; Sun, 30 Dec 2007 15:47:16 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUFlGVk019015
	for <perforce@FreeBSD.org>; Sun, 30 Dec 2007 15:47:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUFlGj7019012
	for perforce@freebsd.org; Sun, 30 Dec 2007 15:47:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 30 Dec 2007 15:47:16 GMT
Message-Id: <200712301547.lBUFlGj7019012@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 132105 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Dec 2007 15:47:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=132105

Change 132105 by hselasky@hselasky_laptop001 on 2007/12/30 15:47:08

	
	Add more USB callbacks to "uchcom". These functions
	were taken from "uplcom".

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/uchcom.c#13 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#13 (text+ko) ====

@@ -893,6 +893,95 @@
 	return;
 }
 
+static void
+uchcom_write_callback(struct usbd_xfer *xfer)
+{
+	struct uchcom_softc *sc = xfer->priv_sc;
+	uint32_t actlen;
+
+	switch (USBD_GET_STATE(xfer)) {
+	case USBD_ST_SETUP:
+	case USBD_ST_TRANSFERRED:
+		if (sc->sc_flag & UCHCOM_FLAG_WRITE_STALL) {
+			usbd_transfer_start(sc->sc_xfer[2]);
+			return;
+		}
+		if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0,
+		    UCHCOM_BULK_BUF_SIZE, &actlen)) {
+
+			DPRINTF(0, "actlen = %d\n", actlen);
+
+			xfer->frlengths[0] = actlen;
+			usbd_start_hardware(xfer);
+		}
+		return;
+
+	default:			/* Error */
+		if (xfer->error != USBD_CANCELLED) {
+			sc->sc_flag |= UCHCOM_FLAG_WRITE_STALL;
+			usbd_transfer_start(sc->sc_xfer[2]);
+		}
+		return;
+
+	}
+}
+
+static void
+uchcom_write_clear_stall_callback(struct usbd_xfer *xfer)
+{
+	struct uchcom_softc *sc = xfer->priv_sc;
+	struct usbd_xfer *xfer_other = sc->sc_xfer[0];
+
+	if (usbd_clear_stall_callback(xfer, xfer_other)) {
+		DPRINTF(0, "stall cleared\n");
+		sc->sc_flag &= ~UCHCOM_FLAG_WRITE_STALL;
+		usbd_transfer_start(xfer_other);
+	}
+	return;
+}
+
+static void
+uchcom_read_callback(struct usbd_xfer *xfer)
+{
+	struct uchcom_softc *sc = xfer->priv_sc;
+
+	switch (USBD_GET_STATE(xfer)) {
+	case USBD_ST_TRANSFERRED:
+		ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, xfer->actlen);
+
+	case USBD_ST_SETUP:
+		if (sc->sc_flag & UCHCOM_FLAG_READ_STALL) {
+			usbd_transfer_start(sc->sc_xfer[3]);
+		} else {
+			xfer->frlengths[0] = xfer->max_data_length;
+			usbd_start_hardware(xfer);
+		}
+		return;
+
+	default:			/* Error */
+		if (xfer->error != USBD_CANCELLED) {
+			sc->sc_flag |= UCHCOM_FLAG_READ_STALL;
+			usbd_transfer_start(sc->sc_xfer[3]);
+		}
+		return;
+
+	}
+}
+
+static void
+uchcom_read_clear_stall_callback(struct usbd_xfer *xfer)
+{
+	struct uchcom_softc *sc = xfer->priv_sc;
+	struct usbd_xfer *xfer_other = sc->sc_xfer[1];
+
+	if (usbd_clear_stall_callback(xfer, xfer_other)) {
+		DPRINTF(0, "stall cleared\n");
+		sc->sc_flag &= ~UCHCOM_FLAG_READ_STALL;
+		usbd_transfer_start(xfer_other);
+	}
+	return;
+}
+
 static device_method_t uchcom_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe, uchcom_probe),