svn commit: r186787 - stable/7/sys/arm/at91

Alexander Motin mav at FreeBSD.org
Mon Jan 5 11:54:00 PST 2009


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);


More information about the svn-src-all mailing list