REM: removed an unused doublett function "printBits" in util.c

[proxmark3-svn] / common / usb_cdc.c

diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index b413523cd846848a1b81eb24a4a11f7aabde13a4..049cb8cf03de52eec8eb95c77bd93cbc47b4b6c6 100644 (file)
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -304,7 +304,6 @@ bool usb_poll()
 **/\r
 bool usb_poll_validate_length()\r
 {\r
-\r
        if (!usb_check()) return false;\r
        if (!(pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank)) return false;\r
        return (pUdp->UDP_CSR[AT91C_EP_OUT] >> 16) >  0;\r
@@ -315,26 +314,27 @@ 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
-  byte_t bank = btReceiveBank;\r
+       byte_t bank = btReceiveBank;\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
-      len -= packetSize;\r
+                       len -= packetSize;\r
                        while(packetSize--)\r
                                data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];\r
+                       \r
                        pUdp->UDP_CSR[AT91C_EP_OUT] &= ~(bank);\r
-                       if (bank == AT91C_UDP_RX_DATA_BK0) {\r
+                       \r
+                       if (bank == AT91C_UDP_RX_DATA_BK0)\r
                                bank = AT91C_UDP_RX_DATA_BK1;\r
-      } else {\r
-                               bank = AT91C_UDP_RX_DATA_BK0;\r
-      }\r
+                       else\r
+                               bank = AT91C_UDP_RX_DATA_BK0;           \r
                }\r
-    if (time_out++ == 0x1fff) break;\r
+               if (time_out++ == 0x1fff) break;\r
        }\r
 \r
        btReceiveBank = bank;\r
@@ -346,11 +346,11 @@ uint32_t usb_read(byte_t* data, size_t len) {
 //* \brief Send through endpoint 2\r
 //*----------------------------------------------------------------------------\r
 uint32_t usb_write(const byte_t* data, const size_t len) {\r
-  size_t length = len;\r
+       size_t length = len;\r
        uint32_t cpt = 0;\r
 \r
-  if (!length) return 0;\r
-  if (!usb_check()) return 0;\r
+       if (!length) return 0;\r
+       if (!usb_check()) return 0;\r
   \r
        // Send the first packet\r
        cpt = MIN(length, AT91C_EP_IN_SIZE-1);\r
@@ -366,16 +366,18 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
                // Wait for the the first bank to be sent\r
                while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {\r
                        if (!usb_check()) return length;\r
-    }\r
+               }\r
                pUdp->UDP_CSR[AT91C_EP_IN] &= ~(AT91C_UDP_TXCOMP);\r
+               \r
                while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);\r
+               \r
                pUdp->UDP_CSR[AT91C_EP_IN] |= AT91C_UDP_TXPKTRDY;\r
        }\r
   \r
        // Wait for the end of transfer\r
        while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {\r
                if (!usb_check()) return length;\r
-  }\r
+       }\r
   \r
        pUdp->UDP_CSR[AT91C_EP_IN] &= ~(AT91C_UDP_TXCOMP);\r
        while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);\r