From owner-svn-src-stable@FreeBSD.ORG  Mon Jan  5 19:53:59 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2DDA2106566B;
	Mon,  5 Jan 2009 19:53:59 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1B6A18FC14;
	Mon,  5 Jan 2009 19:53:59 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n05JrwTe009208;
	Mon, 5 Jan 2009 19:53:58 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n05JrwlM009207;
	Mon, 5 Jan 2009 19:53:58 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200901051953.n05JrwlM009207@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 5 Jan 2009 19:53:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186787 - stable/7/sys/arm/at91
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2009 19:54:00 -0000

Author: mav
Date: Mon Jan  5 19:53:58 2009
New Revision: 186787
URL: http://svn.freebsd.org/changeset/base/186787

Log:
  MFC rev. 183479, 184452.
  
  Keep in sync with latest MMC stack:
  - limit transfers with single block,
  - properly implement read-only.

Modified:
  stable/7/sys/arm/at91/at91_mci.c

Modified: stable/7/sys/arm/at91/at91_mci.c
==============================================================================
--- stable/7/sys/arm/at91/at91_mci.c	Mon Jan  5 19:40:09 2009	(r186786)
+++ stable/7/sys/arm/at91/at91_mci.c	Mon Jan  5 19:53:58 2009	(r186787)
@@ -462,7 +462,7 @@ at91_mci_request(device_t brdev, device_
 static int
 at91_mci_get_ro(device_t brdev, device_t reqdev)
 {
-	return (-1);
+	return (0);
 }
 
 static int
@@ -649,6 +649,9 @@ at91_mci_read_ivar(device_t bus, device_
 	case MMCBR_IVAR_VDD:
 		*(int *)result = sc->host.ios.vdd;
 		break;
+	case MMCBR_IVAR_MAX_DATA:
+		*(int *)result = 1;
+		break;
 	}
 	return (0);
 }
@@ -685,9 +688,11 @@ at91_mci_write_ivar(device_t bus, device
 	case MMCBR_IVAR_VDD:
 		sc->host.ios.vdd = value;
 		break;
+	/* These are read-only */
 	case MMCBR_IVAR_HOST_OCR:
 	case MMCBR_IVAR_F_MIN:
 	case MMCBR_IVAR_F_MAX:
+	case MMCBR_IVAR_MAX_DATA:
 		return (EINVAL);
 	}
 	return (0);