PERFORCE change 106761 for review

[Warner Losh]

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

Change 106761 by imp at imp_lighthouse on 2006/09/27 06:23:35

	Make DTOCYC be a mask

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_mcireg.h#4 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91_mcireg.h#4 (text+ko) ====

@@ -57,15 +57,15 @@
 #define	MCI_MR_PDCMODE     (0x1u << 15) /* (MCI) PDC Oriented Mode */
 #define	MCI_MR_BLKLEN      (0x1u << 18) /* (MCI) Data Block Length */
 /* -------- MCI_DTOR : (MCI Offset: 0x8) MCI Data Timeout Register --------  */
-#define	MCI_DTOR_DTOCYC      (0x1u <<  0) /* (MCI) Data Timeout Cycle Number */
+#define	MCI_DTOR_DTOCYC      (0xfu <<  0) /* (MCI) Data Timeout Cycle Number */
 #define	MCI_DTOR_DTOMUL      (0x7u <<  4) /* (MCI) Data Timeout Multiplier */
 #define		MCI_DTOR_DTOMUL_1                    (0x0u <<  4) /* (MCI) DTOCYC x 1 */
 #define		MCI_DTOR_DTOMUL_16                   (0x1u <<  4) /* (MCI) DTOCYC x 16 */
 #define		MCI_DTOR_DTOMUL_128                  (0x2u <<  4) /* (MCI) DTOCYC x 128 */
 #define		MCI_DTOR_DTOMUL_256                  (0x3u <<  4) /* (MCI) DTOCYC x 256 */
-#define		MCI_DTOR_DTOMUL_1024                 (0x4u <<  4) /* (MCI) DTOCYC x 1024 */
-#define		MCI_DTOR_DTOMUL_4096                 (0x5u <<  4) /* (MCI) DTOCYC x 4096 */
-#define		MCI_DTOR_DTOMUL_65536                (0x6u <<  4) /* (MCI) DTOCYC x 65536 */
+#define		MCI_DTOR_DTOMUL_1k                   (0x4u <<  4) /* (MCI) DTOCYC x 1024 */
+#define		MCI_DTOR_DTOMUL_4k                   (0x5u <<  4) /* (MCI) DTOCYC x 4096 */
+#define		MCI_DTOR_DTOMUL_64k                  (0x6u <<  4) /* (MCI) DTOCYC x 65536 */
 #define		MCI_DTOR_DTOMUL_1M                   (0x7u <<  4) /* (MCI) DTOCYC x 1048576 */
 /* -------- MCI_SDCR : (MCI Offset: 0xc) MCI SD Card Register --------  */
 #define	MCI_SDCR_SDCSEL      (0x1u <<  0) /* (MCI) SD Card Selector */