Implemented support of double buffer for CDC read and write

Author: bbogush

firmware/libs/spl/usb_conf.h

@@ -58,10 +58,16 @@
 
 /* EP1  */
 /* tx buffer base address */
-#define ENDP1_TXADDR        (0xC0)
-#define ENDP2_TXADDR        (0x100)
-#define ENDP3_RXADDR        (0x110)
+#define ENDP1_BUF0_ADDR      (0xC0)
+#define ENDP1_BUF1_ADDR      (0x100)
 
+/* EP2 */
+#define ENDP2_TXADDR        (0x140)
+
+/* EP3 */
+/* rx buffer base address*/
+#define ENDP3_BUF0_ADDR      (0x180)
+#define ENDP3_BUF1_ADDR      (0x1c0)
 
 /*-------------------------------------------------------------*/
 /* -------------------   ISTR events  -------------------------*/

firmware/usb_cdc/hw_config.c

@@ -366,22 +366,27 @@ static void IntToUnicode (uint32_t value , uint8_t *pbuf , uint8_t len)
 * Output         : None.
 * Return         : None.
 *******************************************************************************/
-uint32_t CDC_Send_DATA (uint8_t *ptrBuffer, uint8_t Send_length)
+uint32_t CDC_Send_DATA(uint8_t *ptrBuffer, uint8_t Send_length)
 {
-  /*if max buffer is Not reached*/
-  if(Send_length < VIRTUAL_COM_PORT_DATA_SIZE)     
+  if (Send_length > VIRTUAL_COM_PORT_DATA_SIZE)
+    return 0;
+
+  /* Sent flag */
+  packet_sent = 0;
+
+  if (!(GetENDPOINT(ENDP1) & EP_DTOG_RX))
   {
-    /*Sent flag*/
-    packet_sent = 0;
-    /* send  packet to PMA*/
-    UserToPMABufferCopy((unsigned char*)ptrBuffer, ENDP1_TXADDR, Send_length);
-    SetEPTxCount(ENDP1, Send_length);
-    SetEPTxValid(ENDP1);
+    UserToPMABufferCopy(ptrBuffer, ENDP1_BUF0_ADDR, Send_length);
+    SetEPDblBuf0Count(ENDP1, EP_DBUF_IN, Send_length);
   }
   else
   {
-    return 0;
-  } 
+    UserToPMABufferCopy(ptrBuffer, ENDP1_BUF1_ADDR, Send_length);
+    SetEPDblBuf1Count(ENDP1, EP_DBUF_IN, Send_length);
+  }
+ 
+  FreeUserBuffer(ENDP1, EP_DBUF_IN);
+
   return 1;
 }
 

firmware/usb_cdc/usb_endp.c

@@ -70,9 +70,18 @@ void EP1_IN_Callback (void)
 *******************************************************************************/
 void EP3_OUT_Callback(void)
 {
-  packet_receive = 1;
-  Receive_length = GetEPRxCount(ENDP3);
-  PMAToUserBufferCopy((unsigned char*)Receive_Buffer, ENDP3_RXADDR, Receive_length);
+  if (GetENDPOINT(ENDP3) & EP_DTOG_TX)
+  {
+    Receive_length = GetEPDblBuf0Count(ENDP3);
+    PMAToUserBufferCopy((uint8_t *)Receive_Buffer, ENDP3_BUF0_ADDR, Receive_length);
+  }
+  else
+  {
+    Receive_length = GetEPDblBuf1Count(ENDP3);
+    PMAToUserBufferCopy((uint8_t *)Receive_Buffer, ENDP3_BUF1_ADDR, Receive_length);
+  }
+
+  FreeUserBuffer(ENDP3, EP_DBUF_OUT);
 }
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

firmware/usb_cdc/usb_prop.c

@@ -167,8 +167,12 @@ void Virtual_Com_Port_Reset(void)
 
   /* Initialize Endpoint 1 */
   SetEPType(ENDP1, EP_BULK);
-  SetEPTxAddr(ENDP1, ENDP1_TXADDR);
-  SetEPTxStatus(ENDP1, EP_TX_NAK);
+  SetEPDoubleBuff(ENDP1);
+  SetEPDblBuffAddr(ENDP1, ENDP1_BUF0_ADDR, ENDP1_BUF1_ADDR);
+  ClearDTOG_TX(ENDP1);
+  ClearDTOG_RX(ENDP1);
+  ToggleDTOG_RX(ENDP1);
+  SetEPTxStatus(ENDP1, EP_TX_VALID);
   SetEPRxStatus(ENDP1, EP_RX_DIS);
 
   /* Initialize Endpoint 2 */
@@ -179,8 +183,12 @@ void Virtual_Com_Port_Reset(void)
 
   /* Initialize Endpoint 3 */
   SetEPType(ENDP3, EP_BULK);
-  SetEPRxAddr(ENDP3, ENDP3_RXADDR);
-  SetEPRxCount(ENDP3, VIRTUAL_COM_PORT_DATA_SIZE);
+  SetEPDoubleBuff(ENDP3);
+  SetEPDblBuffAddr(ENDP3, ENDP3_BUF0_ADDR, ENDP3_BUF1_ADDR);
+  SetEPDblBuffCount(ENDP3, EP_DBUF_OUT, VIRTUAL_COM_PORT_DATA_SIZE);
+  ClearDTOG_RX(ENDP3);
+  ClearDTOG_TX(ENDP3);
+  ToggleDTOG_RX(ENDP3);
   SetEPRxStatus(ENDP3, EP_RX_VALID);
   SetEPTxStatus(ENDP3, EP_TX_DIS);