[NUC472/M453] Fix spi_master_transfer failed as bit width is 32

ccli8 · ccli8 · commit e1995dbe7907 · 2016-11-25T15:32:25.000+08:00
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/spi_api.c b/targets/TARGET_NUVOTON/TARGET_M451/spi_api.c
@@ -709,7 +709,12 @@ static uint8_t spi_get_data_width(spi_t *obj)
 {    
     SPI_T *spi_base = (SPI_T *) NU_MODBASE(obj->spi.spi);
     
-    return ((spi_base->CTL & SPI_CTL_DWIDTH_Msk) >> SPI_CTL_DWIDTH_Pos);
+    uint32_t data_width = ((spi_base->CTL & SPI_CTL_DWIDTH_Msk) >> SPI_CTL_DWIDTH_Pos);
+    if (data_width == 0) {
+        data_width = 32;
+    }
+    
+    return data_width;
 }
 
 static int spi_is_tx_complete(spi_t *obj)
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/spi_api.c b/targets/TARGET_NUVOTON/TARGET_NUC472/spi_api.c
@@ -702,7 +702,12 @@ static uint8_t spi_get_data_width(spi_t *obj)
 {    
     SPI_T *spi_base = (SPI_T *) NU_MODBASE(obj->spi.spi);
     
-    return ((spi_base->CTL & SPI_CTL_DWIDTH_Msk) >> SPI_CTL_DWIDTH_Pos);
+    uint32_t data_width = ((spi_base->CTL & SPI_CTL_DWIDTH_Msk) >> SPI_CTL_DWIDTH_Pos);
+    if (data_width == 0) {
+        data_width = 32;
+    }
+    
+    return data_width;
 }
 
 static int spi_is_tx_complete(spi_t *obj)

Original file line number	Diff line number	Diff line change
`@@ -709,7 +709,12 @@ static uint8_t spi_get_data_width(spi_t *obj)`
`709`	`709`	`{`
`710`	`710`	`SPI_T spi_base = (SPI_T ) NU_MODBASE(obj->spi.spi);`
`711`	`711`
`712`		`- return ((spi_base->CTL & SPI_CTL_DWIDTH_Msk) >> SPI_CTL_DWIDTH_Pos);`
	`712`	`+ uint32_t data_width = ((spi_base->CTL & SPI_CTL_DWIDTH_Msk) >> SPI_CTL_DWIDTH_Pos);`
	`713`	`+ if (data_width == 0) {`
	`714`	`+ data_width = 32;`
	`715`	`+ }`
	`716`	`+`
	`717`	`+ return data_width;`
`713`	`718`	`}`
`714`	`719`
`715`	`720`	`static int spi_is_tx_complete(spi_t *obj)`
Original file line number	Diff line number	Diff line change
`@@ -702,7 +702,12 @@ static uint8_t spi_get_data_width(spi_t *obj)`
`702`	`702`	`{`
`703`	`703`	`SPI_T spi_base = (SPI_T ) NU_MODBASE(obj->spi.spi);`
`704`	`704`
`705`		`- return ((spi_base->CTL & SPI_CTL_DWIDTH_Msk) >> SPI_CTL_DWIDTH_Pos);`
	`705`	`+ uint32_t data_width = ((spi_base->CTL & SPI_CTL_DWIDTH_Msk) >> SPI_CTL_DWIDTH_Pos);`
	`706`	`+ if (data_width == 0) {`
	`707`	`+ data_width = 32;`
	`708`	`+ }`
	`709`	`+`
	`710`	`+ return data_width;`
`706`	`711`	`}`
`707`	`712`
`708`	`713`	`static int spi_is_tx_complete(spi_t *obj)`