FIX: Better udp_csr handeling. Usb messages gets to the device better, which makes...

diff --git a/common/usb_cdc.c b/common/usb_cdc.c
index 4d7ea3ed8a1a3019749850fc52ae1f809ecd2f43..5111ac1fe84cbc7a71bf38afcab48394dd22ed9a 100644 (file)
--- a/common/usb_cdc.c
+++ b/common/usb_cdc.c
@@ -153,7 +153,7 @@ const char cfgDescriptor[] = {
 };\r
 \r
 const char strDescriptor[] = {\r
-  26,                          // Length\r
+  26,                  // Length\r
   0x03,                        // Type is string\r
   'p', 0x00,\r
   'r', 0x00,\r
@@ -169,7 +169,32 @@ const char strDescriptor[] = {
   'g', 0x00,\r
 };\r
 \r
+// Bitmap for all status bits in CSR.\r
+#define REG_NO_EFFECT_1_ALL      AT91C_UDP_RX_DATA_BK0 | AT91C_UDP_RX_DATA_BK1 \\r
+                                |AT91C_UDP_STALLSENT   | AT91C_UDP_RXSETUP \\r
+                                |AT91C_UDP_TXCOMP\r
+\r
+// Clear flags in the UDP_CSR register and waits for synchronization\r
+#define UDP_CLEAR_EP_FLAGS(endpoint, flags) { \\r
+       volatile unsigned int reg; \\r
+       reg = pUdp->UDP_CSR[endpoint]; \\r
+       reg |= REG_NO_EFFECT_1_ALL; \\r
+       reg &= ~(flags); \\r
+       pUdp->UDP_CSR[endpoint] = reg; \\r
+       while ( (pUdp->UDP_CSR[endpoint] & (flags)) == (flags)); \\r
+}\r
+\r
+// reset flags in the UDP_CSR register and waits for synchronization\r
+#define UDP_SET_EP_FLAGS(endpoint, flags) { \\r
+       volatile unsigned int reg; \\r
+       reg = pUdp->UDP_CSR[endpoint]; \\r
+       reg |= REG_NO_EFFECT_1_ALL; \\r
+       reg |= (flags); \\r
+       pUdp->UDP_CSR[endpoint] = reg; \\r
+       while ( ( pUdp->UDP_CSR[endpoint] & (flags)) != (flags)); \\r
+}\r
 \r
+       \r
 /* USB standard request code */\r
 #define STD_GET_STATUS_ZERO           0x0080\r
 #define STD_GET_STATUS_INTERFACE      0x0081\r
@@ -222,13 +247,13 @@ byte_t btReceiveBank   = AT91C_UDP_RX_DATA_BK0;
 //* \brief This function deactivates the USB device\r
 //*----------------------------------------------------------------------------\r
 void usb_disable() {\r
-  // Disconnect the USB device\r
-  AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU;\r
-  \r
-  // Clear all lingering interrupts\r
-  if(pUdp->UDP_ISR & AT91C_UDP_ENDBUSRES) {\r
-    pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;\r
-  }\r
+       // Disconnect the USB device\r
+       AT91C_BASE_PIOA->PIO_ODR = GPIO_USB_PU;\r
+\r
+       // Clear all lingering interrupts\r
+       if(pUdp->UDP_ISR & AT91C_UDP_ENDBUSRES) {\r
+               pUdp->UDP_ICR = AT91C_UDP_ENDBUSRES;\r
+       }\r
 }\r
 \r
 //*----------------------------------------------------------------------------\r
@@ -327,9 +352,11 @@ uint32_t usb_read(byte_t* data, size_t len) {
                        len -= packetSize;\r
                        while(packetSize--)\r
                                data[nbBytesRcv++] = pUdp->UDP_FDR[AT91C_EP_OUT];\r
+\r
                        \r
-                       pUdp->UDP_CSR[AT91C_EP_OUT] &= ~(bank);\r
-                       \r
+                       UDP_CLEAR_EP_FLAGS(AT91C_EP_OUT, bank)                  \r
+                       //pUdp->UDP_CSR[AT91C_EP_OUT] &= ~(bank);\r
+\r
                        if (bank == AT91C_UDP_RX_DATA_BK0)\r
                                bank = AT91C_UDP_RX_DATA_BK1;\r
                        else\r
@@ -357,7 +384,9 @@ 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
-       pUdp->UDP_CSR[AT91C_EP_IN] |= AT91C_UDP_TXPKTRDY;\r
+\r
+       UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY)\r
+       //pUdp->UDP_CSR[AT91C_EP_IN] |= AT91C_UDP_TXPKTRDY;\r
 \r
        while (length) {\r
                // Fill the second bank\r
@@ -368,20 +397,23 @@ uint32_t usb_write(const byte_t* data, const size_t len) {
                while (!(pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP)) {\r
                        if (!usb_check()) return length;\r
                }\r
-               pUdp->UDP_CSR[AT91C_EP_IN] &= ~(AT91C_UDP_TXCOMP);\r
                \r
-               while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);\r
+               UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP)\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_TXPKTRDY;\r
+               UDP_SET_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXPKTRDY)\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
-       pUdp->UDP_CSR[AT91C_EP_IN] &= ~(AT91C_UDP_TXCOMP);\r
-       while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);\r
+\r
+       UDP_CLEAR_EP_FLAGS(AT91C_EP_IN, AT91C_UDP_TXCOMP)\r
+       //pUdp->UDP_CSR[AT91C_EP_IN] &= ~(AT91C_UDP_TXCOMP);\r
+       //while (pUdp->UDP_CSR[AT91C_EP_IN] & AT91C_UDP_TXCOMP);\r
 \r
        return length;\r
 }\r
@@ -405,17 +437,22 @@ static void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t leng
                        pUdp->UDP_FDR[0] = *pData++;\r
 \r
                if (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP) {\r
-                       pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);\r
-                       while (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP);\r
+                       \r
+                       UDP_CLEAR_EP_FLAGS(0, AT91C_UDP_TXCOMP)\r
+                       //pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);\r
+                       //while (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP);\r
                }\r
 \r
-               pUdp->UDP_CSR[0] |= AT91C_UDP_TXPKTRDY;\r
+               UDP_SET_EP_FLAGS(0, AT91C_UDP_TXPKTRDY)\r
+               // pUdp->UDP_CSR[0] |= AT91C_UDP_TXPKTRDY;\r
                do {\r
                        csr = pUdp->UDP_CSR[0];\r
 \r
                        // Data IN stage has been stopped by a status OUT\r
                        if (csr & AT91C_UDP_RX_DATA_BK0) {\r
-                               pUdp->UDP_CSR[0] &= ~(AT91C_UDP_RX_DATA_BK0);\r
+                               \r
+                               UDP_CLEAR_EP_FLAGS(0, AT91C_UDP_RX_DATA_BK0)\r
+                               //pUdp->UDP_CSR[0] &= ~(AT91C_UDP_RX_DATA_BK0);\r
                                return;\r
                        }\r
                } while ( !(csr & AT91C_UDP_TXCOMP) );\r
@@ -423,8 +460,10 @@ static void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t leng
        } while (length);\r
 \r
        if (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP) {\r
-               pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);\r
-               while (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP);\r
+               \r
+               UDP_CLEAR_EP_FLAGS(0, AT91C_UDP_TXCOMP)\r
+               //pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);\r
+               //while (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP);\r
        }\r
 }\r
 \r
@@ -433,10 +472,15 @@ static void AT91F_USB_SendData(AT91PS_UDP pUdp, const char *pData, uint32_t leng
 //* \brief Send zero length packet through the control endpoint\r
 //*----------------------------------------------------------------------------\r
 void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {\r
-       pUdp->UDP_CSR[0] |= AT91C_UDP_TXPKTRDY;\r
+\r
+       UDP_SET_EP_FLAGS(0, AT91C_UDP_TXPKTRDY)\r
+       //pUdp->UDP_CSR[0] |= AT91C_UDP_TXPKTRDY;\r
+       \r
        while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP) );\r
-       pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);\r
-       while (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP);\r
+       \r
+       UDP_CLEAR_EP_FLAGS(0, AT91C_UDP_TXCOMP)\r
+       //pUdp->UDP_CSR[0] &= ~(AT91C_UDP_TXCOMP);\r
+       //while (pUdp->UDP_CSR[0] & AT91C_UDP_TXCOMP);\r
 }\r
 \r
 //*----------------------------------------------------------------------------\r
@@ -446,6 +490,7 @@ void AT91F_USB_SendZlp(AT91PS_UDP pUdp) {
 void AT91F_USB_SendStall(AT91PS_UDP pUdp) {\r
        pUdp->UDP_CSR[0] |= AT91C_UDP_FORCESTALL;\r
        while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_ISOERROR) );\r
+       \r
        pUdp->UDP_CSR[0] &= ~(AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR);\r
        while (pUdp->UDP_CSR[0] & (AT91C_UDP_FORCESTALL | AT91C_UDP_ISOERROR));\r
 }\r
@@ -471,11 +516,15 @@ void AT91F_CDC_Enumerate() {
        wLength      |= (pUdp->UDP_FDR[0] << 8);\r
 \r
        if (bmRequestType & 0x80) {\r
-               pUdp->UDP_CSR[0] |= AT91C_UDP_DIR;\r
-               while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_DIR) );\r
+\r
+               UDP_SET_EP_FLAGS(0, AT91C_UDP_DIR)\r
+               //pUdp->UDP_CSR[0] |= AT91C_UDP_DIR;\r
+               //while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_DIR) );\r
        }\r
-       pUdp->UDP_CSR[0] &= ~AT91C_UDP_RXSETUP;\r
-       while ( (pUdp->UDP_CSR[0]  & AT91C_UDP_RXSETUP)  );\r
+       \r
+       UDP_CLEAR_EP_FLAGS(0, AT91C_UDP_RXSETUP)\r
+       //pUdp->UDP_CSR[0] &= ~AT91C_UDP_RXSETUP;\r
+       //while ( (pUdp->UDP_CSR[0]  & AT91C_UDP_RXSETUP)  );\r
 \r
        // Handle supported standard device request Cf Table 9-3 in USB specification Rev 1.1\r
        switch ((bRequest << 8) | bmRequestType) {\r
@@ -566,7 +615,8 @@ void AT91F_CDC_Enumerate() {
        // handle CDC class requests\r
        case SET_LINE_CODING:\r
                while ( !(pUdp->UDP_CSR[0] & AT91C_UDP_RX_DATA_BK0) );\r
-               pUdp->UDP_CSR[0] &= ~(AT91C_UDP_RX_DATA_BK0);\r
+               UDP_CLEAR_EP_FLAGS(0, AT91C_UDP_RX_DATA_BK0)\r
+               //pUdp->UDP_CSR[0] &= ~(AT91C_UDP_RX_DATA_BK0);\r
                AT91F_USB_SendZlp(pUdp);\r
                break;\r
        case GET_LINE_CODING:\r