CVS commit: src/sys/arch/arm/allwinner

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Thu Sep 11 08:20:52 UTC 2014

Modified Files:
        src/sys/arch/arm/allwinner: awin_mmc.c

Log Message:
Make sure the data in the descritors is little endian.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/allwinner/awin_mmc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/allwinner/awin_mmc.c
diff -u src/sys/arch/arm/allwinner/awin_mmc.c:1.9 src/sys/arch/arm/allwinner/awin_mmc.c:1.10
--- src/sys/arch/arm/allwinner/awin_mmc.c:1.9	Tue Sep  9 20:39:52 2014
+++ src/sys/arch/arm/allwinner/awin_mmc.c	Thu Sep 11 08:20:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_mmc.c,v 1.9 2014/09/09 20:39:52 jmcneill Exp $ */
+/* $NetBSD: awin_mmc.c,v 1.10 2014/09/11 08:20:52 matt Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.9 2014/09/09 20:39:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.10 2014/09/11 08:20:52 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -616,26 +616,26 @@ awin_mmc_dma_prepare(struct awin_mmc_sof
 			if (desc == sc->sc_idma_ndesc)
 				break;
 			len = min(sc->sc_idma_xferlen, resid);
-			dma[desc].dma_buf_size = len;
-			dma[desc].dma_buf_addr = paddr + off;
-			dma[desc].dma_config = AWIN_MMC_IDMA_CONFIG_CH |
-					       AWIN_MMC_IDMA_CONFIG_OWN;
+			dma[desc].dma_buf_size = htole32(len);
+			dma[desc].dma_buf_addr = htole32(paddr + off);
+			dma[desc].dma_config = htole32(AWIN_MMC_IDMA_CONFIG_CH |
+					       AWIN_MMC_IDMA_CONFIG_OWN);
 			cmd->c_resid -= len;
 			resid -= len;
 			off += len;
 			if (desc == 0) {
-				dma[desc].dma_config |= AWIN_MMC_IDMA_CONFIG_FD;
+				dma[desc].dma_config |= htole32(AWIN_MMC_IDMA_CONFIG_FD);
 			}
 			if (cmd->c_resid == 0) {
-				dma[desc].dma_config |= AWIN_MMC_IDMA_CONFIG_LD;
-				dma[desc].dma_config |= AWIN_MMC_IDMA_CONFIG_ER;
+				dma[desc].dma_config |= htole32(AWIN_MMC_IDMA_CONFIG_LD);
+				dma[desc].dma_config |= htole32(AWIN_MMC_IDMA_CONFIG_ER);
 				dma[desc].dma_next = 0;
 			} else {
 				dma[desc].dma_config |=
-				    AWIN_MMC_IDMA_CONFIG_DIC;
-				dma[desc].dma_next =
+				    htole32(AWIN_MMC_IDMA_CONFIG_DIC);
+				dma[desc].dma_next = htole32(
 				    desc_paddr + ((desc+1) *
-				    sizeof(struct awin_mmc_idma_descriptor));
+				    sizeof(struct awin_mmc_idma_descriptor)));
 			}
 			++desc;
 		}