CHG: FpgaSetupDMA, handle when it returns NULL.

[proxmark3-svn] / common / usb_cdc.c

diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index ccbb3c50e91389a4d733e25f75c7f94e50e77ef5..9bdaed29c6f8bdbfd9ac704928c7892b91fd7f7f 100644 (file)
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -46,7 +46,8 @@ const char devDescriptor[] = {
        /* Device descriptor */\r
        0x12,      // bLength\r
        0x01,      // bDescriptorType\r
        /* Device descriptor */\r
        0x12,      // bLength\r
        0x01,      // bDescriptorType\r

-       0x10,0x01, // Complies with USB Spec. Release (0110h = release 1.10)\r
+       //0x10,0x01, // Complies with USB Spec. Release (0110h = release 1.10)\r
+       0x00,0x02, // Complies with USB Spec. Release (0110h = release 2.00)\r

        0x02,      // bDeviceClass:    CDC class code\r
        0x00,      // bDeviceSubclass: CDC class sub code\r
        0x00,      // bDeviceProtocol: CDC Device protocol\r
        0x02,      // bDeviceClass:    CDC class code\r
        0x00,      // bDeviceSubclass: CDC class sub code\r
        0x00,      // bDeviceProtocol: CDC Device protocol\r


@@ -235,31 +236,32 @@ void usb_disable() {
 //* \brief This function Activates the USB device\r
 //*----------------------------------------------------------------------------\r
 void usb_enable() {\r
 //* \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
        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
        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
 \r

-  // Reconnect USB reconnect\r
-  AT91C_BASE_PIOA->PIO_SODR = GPIO_USB_PU;\r
-  AT91C_BASE_PIOA->PIO_OER = GPIO_USB_PU;\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
+    //sleep(1);\r
+       \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
 }\r
 \r
 //*----------------------------------------------------------------------------\r


@@ -293,31 +295,47 @@ bool usb_poll()
   return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);\r
 }\r
 \r
   return (pUdp->UDP_CSR[AT91C_EP_OUT] & btReceiveBank);\r
 }\r
 \r

+/**\r
+       In github PR #129, some users appears to get a false positive from\r
+       usb_poll, which returns true, but the usb_read operation\r
+       still returns 0.\r
+       This check is basically the same as above, but also checks\r
+       that the length available to read is non-zero, thus hopefully fixes the\r
+       bug.\r
+**/\r
+bool usb_poll_validate_length()\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
+}\r
+\r

 //*----------------------------------------------------------------------------\r
 //* \fn    usb_read\r
 //* \brief Read available data from Endpoint OUT\r
 //*----------------------------------------------------------------------------\r
 uint32_t usb_read(byte_t* data, size_t len) {\r
 //*----------------------------------------------------------------------------\r
 //* \fn    usb_read\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
                        while(packetSize--)\r
                                data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];\r

+                       \r

                        pUdp->UDP_CSR[AT91C_EP_OUT] &= ~(bank);\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
                                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
                }\r

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

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


@@ -329,11 +347,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
 //* \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
        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
   \r
        // Send the first packet\r
        cpt = MIN(length, AT91C_EP_IN_SIZE-1);\r


@@ -346,19 +364,21 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
                cpt = MIN(length, AT91C_EP_IN_SIZE-1);\r
                length -= cpt;\r
                while (cpt--) pUdp->UDP_FDR[AT91C_EP_IN] = *data++;\r
                cpt = MIN(length, AT91C_EP_IN_SIZE-1);\r
                length -= cpt;\r
                while (cpt--) pUdp->UDP_FDR[AT91C_EP_IN] = *data++;\r

-               // Wait for the the first bank to be sent\r
+               // Wait for the first bank to be sent\r

                while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {\r
                        if (!usb_check()) return length;\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
                pUdp->UDP_CSR[AT91C_EP_IN] &= ~(AT91C_UDP_TXCOMP);\r

+               \r

                while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);\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
                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
   \r
        pUdp->UDP_CSR[AT91C_EP_IN] &= ~(AT91C_UDP_TXCOMP);\r
        while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);\r