Variables total_length and rem_length moved into device specific context

Author: makarenya

cores/arduino/stm32/usb/cdc/usbd_cdc.c

@@ -651,9 +651,9 @@ static uint8_t USBD_CDC_DataIn(USBD_HandleTypeDef *pdev, uint8_t epnum)
  USBD_CDC_ItfTypeDef *ctrl = (USBD_CDC_ItfTypeDef *)pdev->pUserData;
 
  if (pdev->pClassData != NULL) {
- if ((pdev->ep_in[epnum].total_length > 0U) && ((pdev->ep_in[epnum].total_length % hpcd->IN_ep[epnum].maxpacket) == 0U)) {
+ if ((hcdc->TxLastLength > 0U) && ((hcdc->TxLastLength % hpcd->IN_ep[epnum].maxpacket) == 0U)) {
  /* Update the packet total length */
- pdev->ep_in[epnum].total_length = 0U;
+ hcdc->TxLastLength = 0U;
 
  /* Send ZLP */
  USBD_LL_Transmit(pdev, epnum, NULL, 0U);
@@ -835,7 +835,7 @@ uint8_t USBD_CDC_TransmitPacket(USBD_HandleTypeDef *pdev)
  hcdc->TxState = 1U;
 
  /* Update the packet total length */
- pdev->ep_in[CDC_IN_EP & 0xFU].total_length = hcdc->TxLength;
+ hcdc->TxLastLength = hcdc->TxLength;
 
  /* Transmit next packet */
  USBD_LL_Transmit(pdev, CDC_IN_EP, hcdc->TxBuffer,

cores/arduino/stm32/usb/cdc/usbd_cdc.h

@@ -115,6 +115,7 @@ typedef struct {
  uint8_t *TxBuffer;
  uint32_t RxLength;
  uint32_t TxLength;
+ uint32_t TxLastLength;
 
  __IO uint32_t TxState;
  __IO uint32_t RxState;

system/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h

@@ -223,8 +223,6 @@ typedef struct {
 typedef struct {
  uint32_t status;
  uint32_t is_used;
- uint32_t total_length;
- uint32_t rem_length;
 } USBD_EndpointTypeDef;
 
 /* USB Device handle structure */
@@ -238,6 +236,8 @@ typedef struct _USBD_HandleTypeDef {
  USBD_EndpointTypeDef ep_out[15];
  uint32_t ep0_state;
  uint32_t ep0_data_len;
+ uint32_t ep0_rem_len;
+ uint32_t ep0_total_len;
  uint8_t dev_state;
  uint8_t dev_old_state;
  uint8_t dev_address;

system/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c

@@ -289,18 +289,14 @@ USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup)
 USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev,
  uint8_t epnum, uint8_t *pdata)
 {
- USBD_EndpointTypeDef *pep;
-
  if (epnum == 0U) {
- pep = &pdev->ep_out[0];
-
  if (pdev->ep0_state == USBD_EP0_DATA_OUT) {
- if (pep->rem_length > USB_MAX_EP0_SIZE) {
- pep->rem_length -=  USB_MAX_EP0_SIZE;
+ if (pdev->ep0_rem_len > USB_MAX_EP0_SIZE) {
+ pdev->ep0_rem_len -= USB_MAX_EP0_SIZE;
 
  USBD_CtlContinueRx(pdev,
  pdata,
- (uint16_t)MIN(pep->rem_length, USB_MAX_EP0_SIZE));
+ (uint16_t)MIN(pdev->ep0_rem_len, USB_MAX_EP0_SIZE));
  } else {
  if ((pdev->pClass->EP0_RxReady != NULL) &&
  (pdev->dev_state == USBD_STATE_CONFIGURED)) {
@@ -338,24 +334,20 @@ USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev,
 USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev, uint8_t epnum,
  uint8_t *pdata)
 {
- USBD_EndpointTypeDef *pep;
-
  if (epnum == 0U) {
- pep = &pdev->ep_in[0];
-
  if (pdev->ep0_state == USBD_EP0_DATA_IN) {
- if (pep->rem_length > USB_MAX_EP0_SIZE) {
- pep->rem_length -= USB_MAX_EP0_SIZE;
+ if (pdev->ep0_rem_len > USB_MAX_EP0_SIZE) {
+ pdev->ep0_rem_len -= USB_MAX_EP0_SIZE;
 
- USBD_CtlContinueSendData(pdev, pdata, (uint16_t)pep->rem_length);
+ USBD_CtlContinueSendData(pdev, pdata, (uint16_t)pdev->ep0_rem_len);
 
  /* Prepare endpoint for premature end of transfer */
  USBD_LL_PrepareReceive(pdev, 0U, NULL, 0U);
  } else {
  /* last packet is MPS multiple, so send ZLP packet */
- if ((pep->total_length % USB_MAX_EP0_SIZE == 0U) &&
- (pep->total_length >= USB_MAX_EP0_SIZE) &&
- (pep->total_length < pdev->ep0_data_len)) {
+ if ((pdev->ep0_total_len % USB_MAX_EP0_SIZE == 0U) &&
+ (pdev->ep0_total_len >= USB_MAX_EP0_SIZE) &&
+ (pdev->ep0_total_len < pdev->ep0_data_len)) {
  USBD_CtlContinueSendData(pdev, NULL, 0U);
  pdev->ep0_data_len = 0U;
 

system/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c

@@ -89,8 +89,8 @@ USBD_StatusTypeDef USBD_CtlSendData(USBD_HandleTypeDef *pdev, uint8_t *pbuf,
 {
  /* Set EP0 State */
  pdev->ep0_state = USBD_EP0_DATA_IN;
- pdev->ep_in[0].total_length = len;
- pdev->ep_in[0].rem_length = len;
+ pdev->ep0_total_len = len;
+ pdev->ep0_rem_len = len;
 
  /* Start the transfer */
  USBD_LL_Transmit(pdev, 0x00U, pbuf, len);
@@ -128,8 +128,8 @@ USBD_StatusTypeDef USBD_CtlPrepareRx(USBD_HandleTypeDef *pdev, uint8_t *pbuf,
 {
  /* Set EP0 State */
  pdev->ep0_state = USBD_EP0_DATA_OUT;
- pdev->ep_out[0].total_length = len;
- pdev->ep_out[0].rem_length = len;
+ pdev->ep0_total_len = len;
+ pdev->ep0_rem_len = len;
 
  /* Start the transfer */
  USBD_LL_PrepareReceive(pdev, 0U, pbuf, len);