From owner-p4-projects@FreeBSD.ORG  Sun Oct 26 08:18:12 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 645BF106566C; Sun, 26 Oct 2008 08:18:12 +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 1C0AF1065676
	for <perforce@freebsd.org>; Sun, 26 Oct 2008 08:18:12 +0000 (UTC)
	(envelope-from andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 09AD98FC0C
	for <perforce@freebsd.org>; Sun, 26 Oct 2008 08:18:12 +0000 (UTC)
	(envelope-from andrew@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 m9Q8IB0M015507
	for <perforce@freebsd.org>; Sun, 26 Oct 2008 08:18:11 GMT
	(envelope-from andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9Q8IBsM015505
	for perforce@freebsd.org; Sun, 26 Oct 2008 08:18:11 GMT
	(envelope-from andrew@freebsd.org)
Date: Sun, 26 Oct 2008 08:18:11 GMT
Message-Id: <200810260818.m9Q8IBsM015505@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andrew@freebsd.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 151940 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, 26 Oct 2008 08:18:12 -0000

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

Change 151940 by andrew@andrew_bender on 2008/10/26 08:17:42

	Disable interrupts in s3c24x0_mci_fini
	Implement MMC/SD writing

Affected files ...

.. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_mci.c#2 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_mci.c#2 (text+ko) ====

@@ -120,6 +120,10 @@
 static void
 s3c24x0_mci_fini(device_t dev)
 {
+	struct s3c24x0_mci_softc *sc;
+
+	sc = device_get_softc(dev);
+	WR4(sc, SDI_IMSK, 0x0); /* Disable all interrupts */
 }
 
 static int
@@ -231,7 +235,8 @@
 {
 	uint32_t cmdr, dcon;
 	struct mmc_data *data;
-	int fifo_cnt, read_cnt;
+	uint32_t *vaddr;
+	int read_cnt, write_cnt;
 
 	sc->curcmd = cmd;
 	data = cmd->data;
@@ -276,14 +281,22 @@
 
 	WR4(sc, SDI_CCON, cmdr);
 
-	if (data && (data->flags & MMC_DATA_READ)) {
-		uint32_t *vaddr = cmd->data->data;
-		read_cnt = cmd->data->len;
-		fifo_cnt = 0;
-		while(read_cnt) {
-			*(vaddr++) = RD4(sc, SDI_DAT);
-			read_cnt -= 4;
-			fifo_cnt++;
+	if (data) {
+		if (data->flags & MMC_DATA_WRITE) {
+			vaddr = cmd->data->data;
+			write_cnt = cmd->data->len;
+			while (write_cnt > 0) {
+				WR4(sc, SDI_DAT, *(vaddr++));
+				write_cnt -= 4;
+			}
+		}
+		if (data->flags & MMC_DATA_READ) {
+			vaddr = cmd->data->data;
+			read_cnt = cmd->data->len;
+			while (read_cnt > 0) {
+				*(vaddr++) = RD4(sc, SDI_DAT);
+				read_cnt -= 4;
+			}
 		}
 	}
 }
@@ -338,7 +351,7 @@
 static int
 s3c24x0_mci_get_ro(device_t brdev, device_t reqdev)
 {
-	return (-1);
+	return (0);
 }
 
 static int