From owner-p4-projects@FreeBSD.ORG  Mon Jul 13 14:04:28 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 824251065673; Mon, 13 Jul 2009 14:04:28 +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 425651065670
	for <perforce@FreeBSD.org>; Mon, 13 Jul 2009 14:04:28 +0000 (UTC)
	(envelope-from syl@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 160618FC19
	for <perforce@FreeBSD.org>; Mon, 13 Jul 2009 14:04:28 +0000 (UTC)
	(envelope-from syl@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6DE4RCH001905
	for <perforce@FreeBSD.org>; Mon, 13 Jul 2009 14:04:27 GMT
	(envelope-from syl@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6DE4R94001903
	for perforce@freebsd.org; Mon, 13 Jul 2009 14:04:27 GMT
	(envelope-from syl@FreeBSD.org)
Date: Mon, 13 Jul 2009 14:04:27 GMT
Message-Id: <200907131404.n6DE4R94001903@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	syl@FreeBSD.org using -f
From: Sylvestre Gallon <syl@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 166006 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: Mon, 13 Jul 2009 14:04:29 -0000

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

Change 166006 by syl@syl_pablo on 2009/07/13 14:03:42

	Implement set_stall.
	Implement device_done needed by set_stall.

Affected files ...

.. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.c#5 edit

Differences ...

==== //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/s3c24xxdci.c#5 (text+ko) ====

@@ -72,6 +72,8 @@
     "s3c24xxdci debug level");
 #endif
 
+static void	s3c24dci_device_done(struct usb_xfer *, usb_error_t);
+
 /*
  *	This driver dont support DMA for the mement. DMA seems to not be 
  *	implemented on s3c2xxx cpus.
@@ -133,6 +135,35 @@
 };
 
 /*
+ * Transfer stuff.
+ */
+
+static void	s3c24dci_device_done(struct usb_xfer *, usb_error_t)
+{
+	struct s3c24dci_softc *sc = S3C24_DCI_BUS2SC(xfer->xroot->bus);
+	uint32_t ittmp;
+	uint8_t ep_no;
+
+	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
+
+	DPRINTF(2, "xfer=%p, endpoint=%p, error=%d\n",
+	    xfer, xfer->endpointnom & UE_ADDR);
+
+	if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) {
+		ep_no = (xfer->endpointno & UE_ADDR);
+
+		/* disable endpoint interrupt */
+		ittmp = S3C24XX_DCI_READ_4(S3C24_DCI_EP_INT_EN);
+		ittmp &= ~(1<<ep_no);
+		S3C24XX_DCI_WRITE_4(S3C24_DCI_EP_INT_EN, ittmp);	
+
+		DPRINTF(15, "disable interrupts on endpoint %d\n", ep_no);
+	}
+
+	usbd_transfer_done(xfer, error);
+}
+
+/*
  * s3c24xxdci ctrl support
  */
 
@@ -310,14 +341,13 @@
 	s3c24dci_get_hw_ep_profile(NULL, &pf, ep_no);
 
 	/* Clear SEND_STALL */
+	S3C24XX_DCI_WRITE_4(S3C24_DCI_INDEX, ep_no);
 	if (ep_dir & UE_DIR_IN) {
-		S3C24XX_DCI_WRITE_4(S3C24_DCI_INDEX, ep_no);
 		stallcmp = S3C24XX_DCI_READ_4(S3C24_DCI_IN_CSR1);
 		stallcmp &= ~(S3C24_DCI_IN_SEND_STALL);
 		S3C24XX_DCI_WRITE_4(S3C24_DCI_INDEX, ep_no);
 		S3C24XX_DCI_WRITE_4(S3C24_DCI_IN_CSR1 , stallcmp);
 	} else {
-		S3C24XX_DCI_WRITE_4(S3C24_DCI_INDEX, ep_no);
 		stallcmp = S3C24XX_DCI_READ_4(S3C24_DCI_OUT_CSR1);
 		stallcmp &= ~(S3C24_DCI_OUT_SEND_STALL);
 		S3C24XX_DCI_WRITE_4(S3C24_DCI_INDEX, ep_no);
@@ -399,6 +429,29 @@
 s3c24dci_set_stall(struct usb_device *udev, struct usb_xfer *xfer,
     struct usb_endpoint *ep, uint8_t *did_stall)
 {
+	struct s3c24dci_softc *sc;
+	uint32_t csr;
+
+	USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED);
+
+	DPRINTF(5, "endpoint=%p\n", ep);
+
+	if (xfer) {
+		/* cancel any ongoing transfers */
+		s3c24dci_device_done(xfer, USB_ERR_STALLED);
+	}
+
+	/* set STALL */
+	S3C24XX_DCI_WRITE_4(S3C24_DCI_INDEX, (ep->ed->bEndpointAddress & UE_ADDR));
+	if (ep->ed->bEndpointAddress & (UE_DIR_IN|UE_DIR_OUT) == UE_DIR_IN) {
+		csr = S3C24XX_DCI_READ_4(S3C24_DCI_IN_CSR1);
+		csr |= S3C24_DCI_IN_SEND_STALL;
+		S3C24XX_DCI_WRITE_4(S3C24_DCI_IN_CSR1, csr);
+	} else {
+		csr = S3C24XX_DCI_READ_4(S3C24_DCI_OUT_CSR1);
+		csr |= S3C24_DCI_OUT_SEND_STALL;
+		S3C24XX_DCI_WRITE_4(S3C24_DCI_OUT_CSR1, csr);
+	}
 
 	return ;
 }