Changeset 415 for trunk/softs/tsar_boot/src/spi.c

Timestamp:

Jun 18, 2013, 10:25:15 AM (11 years ago)

Author:

cfuguet

Message:

Modifications in soft/tsar_boot:

• Fixing indentation problems in spi.c code
• Erasing useless print in boot_elf_loader.c

File:

• trunk/softs/tsar_boot/src/spi.c (modified) (3 diffs)

trunk/softs/tsar_boot/src/spi.c

@@ -92 +92 @@
 
     _spi_wait_if_busy(spi);
+
     /* switch to 128 bits words */
     spi_ctrl0 = ioread32(&spi->ctrl);
@@ -99 +100 @@
     /* read data */
     for (i = 0; i + 3 < count / 4; i += 4) {
-        iowrite32(&spi->rx_tx[0], 0xffffffff);
-        iowrite32(&spi->rx_tx[1], 0xffffffff);
-        iowrite32(&spi->rx_tx[2], 0xffffffff);
-        iowrite32(&spi->rx_tx[3], 0xffffffff);
-        iowrite32(&spi->ctrl,  spi_ctrl | SPI_CTRL_GO_BSY);
+        iowrite32(&spi->rx_tx[0], 0xffffffff);
+        iowrite32(&spi->rx_tx[1], 0xffffffff);
+        iowrite32(&spi->rx_tx[2], 0xffffffff);
+        iowrite32(&spi->rx_tx[3], 0xffffffff);
+        iowrite32(&spi->ctrl,  spi_ctrl | SPI_CTRL_GO_BSY);
+
         _spi_wait_if_busy(spi);
-        *data = bswap32(ioread32(&spi->rx_tx[3]));
-        data++;
-        *data = bswap32(ioread32(&spi->rx_tx[2]));
-        data++;
-        *data = bswap32(ioread32(&spi->rx_tx[1]));
-        data++;
-        *data = bswap32(ioread32(&spi->rx_tx[0]));
-        data++;
+        
+        *data = bswap32(ioread32(&spi->rx_tx[3]));
+        data++;
+        *data = bswap32(ioread32(&spi->rx_tx[2]));
+        data++;
+        *data = bswap32(ioread32(&spi->rx_tx[1]));
+        data++;
+        *data = bswap32(ioread32(&spi->rx_tx[0]));
+        data++;
     }
+
     /* switch back to original word size */
     iowrite32(&spi->ctrl, spi_ctrl0);
+
     /* read missing bits */
     data8 = (void *)data;
     i = i * 4;
-    for (; i < count; i++) {
-        iowrite32(&spi->rx_tx[0], 0xffffffff);
-        iowrite32(&spi->ctrl,  spi_ctrl0 | SPI_CTRL_GO_BSY);
-        _spi_wait_if_busy(spi);
-        *data8 = spi_get_rx(spi, 0);
-        data8++;
+    for (; i < count; i++)
+    {
+        iowrite32(&spi->rx_tx[0], 0xffffffff);
+        iowrite32(&spi->ctrl,  spi_ctrl0 | SPI_CTRL_GO_BSY);
+    
+        _spi_wait_if_busy(spi);
+    
+        *data8 = spi_get_rx(spi, 0);
+        data8++;
     }
     return;
@@ -145 +153 @@
 void spi_dev_config (
     struct spi_dev * spi,
-    int spi_freq        ,
+    int spi_freq        ,
     int sys_freq        ,
-    int char_len                ,
-    int tx_edge                 ,
-    int rx_edge                 )
+    int char_len        ,
+    int tx_edge         ,
+    int rx_edge         )
 {
     unsigned int spi_ctrl = ioread32(&spi->ctrl);