Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / common / usb_cdc.c

diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index c8d5af1c4363d9c152eba6b535a9e53c0fa53364..ccbb3c50e91389a4d733e25f75c7f94e50e77ef5 100644 (file)
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -33,7 +33,7 @@
  */\r
 \r
 #include "usb_cdc.h"\r
-#include "../include/config_gpio.h"\r
+#include "config_gpio.h"\r
 \r
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))\r
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))\r
@@ -235,31 +235,31 @@ void usb_disable() {
 //* \brief This function Activates the USB device\r
 //*----------------------------------------------------------------------------\r
 void usb_enable() {\r
-       // Set the PLL USB Divider\r
-       AT91C_BASE_CKGR->CKGR_PLLR |= AT91C_CKGR_USBDIV_1 ;\r
-\r
-       // Specific Chip USB Initialisation\r
-       // Enables the 48MHz USB clock UDPCK and System Peripheral USB Clock\r
-       AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_UDP;\r
-       AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_UDP);\r
-\r
-       // Enable UDP PullUp (USB_DP_PUP) : enable & Clear of the corresponding PIO\r
-       // Set in PIO mode and Configure in Output\r
-       AT91C_BASE_PIOA->PIO_PER = GPIO_USB_PU; // Set in PIO mode\r
+  // Set the PLL USB Divider\r
+  AT91C_BASE_CKGR->CKGR_PLLR |= AT91C_CKGR_USBDIV_1 ;\r
+  \r
+  // Specific Chip USB Initialisation\r
+  // Enables the 48MHz USB clock UDPCK and System Peripheral USB Clock\r
+  AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_UDP;\r
+  AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_UDP);\r
+  \r
+  // Enable UDP PullUp (USB_DP_PUP) : enable & Clear of the corresponding PIO\r
+  // Set in PIO mode and Configure in Output\r
+  AT91C_BASE_PIOA->PIO_PER = GPIO_USB_PU; // Set in PIO mode\r
        AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU; // Configure as Output\r
-\r
-       // Clear for set the Pullup resistor\r
+  \r
+  // Clear for set the Pullup resistor\r
        AT91C_BASE_PIOA->PIO_CODR = GPIO_USB_PU;\r
+  \r
+  // Disconnect and reconnect USB controller for 100ms\r
+  usb_disable();\r
+  \r
+  // Wait for a short while\r
+  for (volatile size_t i=0; i<0x100000; i++);\r
 \r
-       // Disconnect and reconnect USB controller for 100ms\r
-       usb_disable();\r
-\r
-       // Wait for a short while\r
-       for (volatile size_t i=0; i<0x100000; i++);\r
-\r
-       // Reconnect USB reconnect\r
-       AT91C_BASE_PIOA->PIO_SODR = GPIO_USB_PU;\r
-       AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU;\r
+  // Reconnect USB reconnect\r
+  AT91C_BASE_PIOA->PIO_SODR = GPIO_USB_PU;\r
+  AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU;\r
 }\r
 \r
 //*----------------------------------------------------------------------------\r
@@ -298,26 +298,26 @@ bool usb_poll()
 //* \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
                        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
-                       }\r
+      }\r
                }\r
-               if (time_out++ == 0x1fff) break;\r
+    if (time_out++ == 0x1fff) break;\r
        }\r
 \r
        btReceiveBank = bank;\r
@@ -349,7 +349,7 @@ 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
                while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);\r
                pUdp->UDP_CSR[AT91C_EP_IN] |= AT91C_UDP_TXPKTRDY;\r
@@ -370,7 +370,7 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
 //* \fn    AT91F_USB_SendData\r
 //* \brief Send Data through the control endpoint\r
 //*----------------------------------------------------------------------------\r
-unsigned int csrTab[100];\r
+unsigned int csrTab[100] = {0x00};\r
 unsigned char csrIdx = 0;\r
 \r
 static void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t length) {\r