Merge branch 'master' into topaz

[proxmark3-svn] / common / usb_cdc.c

diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index 3c6e928238d11b285e66375ce1ffff2bb28946e2..e13ddbe227e2ea81275cdce764cd24cd0bc95f81 100644 (file)
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -314,26 +314,26 @@ bool usb_poll_validate_length()
 //* \brief Read available data from Endpoint OUT\r
 //*----------------------------------------------------------------------------\r
 uint32_t usb_read(byte_t* data, size_t len) {\r
 //* \brief Read available data from Endpoint OUT\r
 //*----------------------------------------------------------------------------\r
 uint32_t usb_read(byte_t* data, size_t len) {\r

-  byte_t bank = btReceiveBank;\r
+       byte_t bank = btReceiveBank;\r

        uint32_t packetSize, nbBytesRcv = 0;\r
        uint32_t packetSize, nbBytesRcv = 0;\r

-  uint32_t time_out = 0;\r
+       uint32_t time_out = 0;\r

   \r
        while (len)  {\r
                if (!usb_check()) break;\r
 \r
                if ( pUdp->UDP_CSR[AT91C_EP_OUT] & bank ) {\r
                        packetSize = MIN(pUdp->UDP_CSR[AT91C_EP_OUT] >> 16, len);\r
   \r
        while (len)  {\r
                if (!usb_check()) break;\r
 \r
                if ( pUdp->UDP_CSR[AT91C_EP_OUT] & bank ) {\r
                        packetSize = MIN(pUdp->UDP_CSR[AT91C_EP_OUT] >> 16, len);\r

-      len -= packetSize;\r
+                       len -= packetSize;\r

                        while(packetSize--)\r
                                data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];\r
                        pUdp->UDP_CSR[AT91C_EP_OUT] &= ~(bank);\r
                        if (bank == AT91C_UDP_RX_DATA_BK0) {\r
                                bank = AT91C_UDP_RX_DATA_BK1;\r
                        while(packetSize--)\r
                                data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];\r
                        pUdp->UDP_CSR[AT91C_EP_OUT] &= ~(bank);\r
                        if (bank == AT91C_UDP_RX_DATA_BK0) {\r
                                bank = AT91C_UDP_RX_DATA_BK1;\r

-      } else {\r
+                       } else {\r

                                bank = AT91C_UDP_RX_DATA_BK0;\r
                                bank = AT91C_UDP_RX_DATA_BK0;\r

-      }\r
+                       }\r

                }\r
                }\r

-    if (time_out++ == 0x1fff) break;\r
+               if (time_out++ == 0x1fff) break;\r

        }\r
 \r
        btReceiveBank = bank;\r
        }\r
 \r
        btReceiveBank = bank;\r