Extend changes to other STM32 devices that have the PCD_WriteEmptyTxFifo() function

Paul Thompson · Paul Thompson · commit 20f11bc13f66 · 2018-04-13T05:27:03.000-07:00
diff --git a/targets/TARGET_STM/TARGET_STM32F1/device/stm32f1xx_hal_pcd.c b/targets/TARGET_STM/TARGET_STM32F1/device/stm32f1xx_hal_pcd.c
@@ -1152,7 +1152,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
 {
   USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;  
   USB_OTG_EPTypeDef *ep = NULL;
-  int32_t len = 0;
+  uint32_t len;
   uint32_t len32b = 0U;
   uint32_t fifoemptymsk = 0U;
   
@@ -1185,7 +1185,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
     ep->xfer_count += len;
   }
   
-  if(len <= 0)
+  if (ep->xfer_count >= ep->xfer_len)
   {
     fifoemptymsk = 0x01U << epnum;
     USBx_DEVICE->DIEPEMPMSK &= ~fifoemptymsk;
diff --git a/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_pcd.c b/targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_pcd.c
@@ -1213,7 +1213,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
 {
   USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;  
   USB_OTG_EPTypeDef *ep;
-  int32_t len = 0U;
+  uint32_t len;
   uint32_t len32b;
   uint32_t fifoemptymsk = 0U;
 
@@ -1247,7 +1247,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
     ep->xfer_count += len;
   }
   
-  if(len <= 0U)
+  if (ep->xfer_count >= ep->xfer_len)
   {
     fifoemptymsk = 0x1U << epnum;
     atomic_clr_u32(&USBx_DEVICE->DIEPEMPMSK,  fifoemptymsk);
diff --git a/targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_pcd.c b/targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_pcd.c
@@ -1311,7 +1311,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
 {
   USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;  
   USB_OTG_EPTypeDef *ep;
-  int32_t len = 0U;
+  uint32_t len;
   uint32_t len32b;
   uint32_t fifoemptymsk = 0U;
 
@@ -1345,7 +1345,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
     ep->xfer_count += len;
   }
   
-  if(len <= 0U)
+  if (ep->xfer_count >= ep->xfer_len)
   {
     fifoemptymsk = 0x1U << epnum;
 /* MBED */
diff --git a/targets/TARGET_STM/TARGET_STM32L4/device/stm32l4xx_hal_pcd.c b/targets/TARGET_STM/TARGET_STM32L4/device/stm32l4xx_hal_pcd.c
@@ -1428,7 +1428,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
 {
   USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;  
   USB_OTG_EPTypeDef *ep = NULL;
-  int32_t len = 0U;
+  uint32_t len;
   uint32_t len32b = 0;
   uint32_t fifoemptymsk = 0;
 
@@ -1462,7 +1462,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
     ep->xfer_count += len;
   }
   
-  if(len <= 0)
+  if (ep->xfer_count >= ep->xfer_len)
   {
     fifoemptymsk = 0x1 << epnum;
     // Added for MBED PR #3062

Original file line number	Diff line number	Diff line change
`@@ -1152,7 +1152,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1152`	`1152`	`{`
`1153`	`1153`	`USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;`
`1154`	`1154`	`USB_OTG_EPTypeDef *ep = NULL;`
`1155`		`- int32_t len = 0;`
	`1155`	`+ uint32_t len;`
`1156`	`1156`	`uint32_t len32b = 0U;`
`1157`	`1157`	`uint32_t fifoemptymsk = 0U;`
`1158`	`1158`
`@@ -1185,7 +1185,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1185`	`1185`	`ep->xfer_count += len;`
`1186`	`1186`	`}`
`1187`	`1187`
`1188`		`- if(len <= 0)`
	`1188`	`+ if (ep->xfer_count >= ep->xfer_len)`
`1189`	`1189`	`{`
`1190`	`1190`	`fifoemptymsk = 0x01U << epnum;`
`1191`	`1191`	`USBx_DEVICE->DIEPEMPMSK &= ~fifoemptymsk;`
Original file line number	Diff line number	Diff line change
`@@ -1213,7 +1213,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1213`	`1213`	`{`
`1214`	`1214`	`USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;`
`1215`	`1215`	`USB_OTG_EPTypeDef *ep;`
`1216`		`- int32_t len = 0U;`
	`1216`	`+ uint32_t len;`
`1217`	`1217`	`uint32_t len32b;`
`1218`	`1218`	`uint32_t fifoemptymsk = 0U;`
`1219`	`1219`
`@@ -1247,7 +1247,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1247`	`1247`	`ep->xfer_count += len;`
`1248`	`1248`	`}`
`1249`	`1249`
`1250`		`- if(len <= 0U)`
	`1250`	`+ if (ep->xfer_count >= ep->xfer_len)`
`1251`	`1251`	`{`
`1252`	`1252`	`fifoemptymsk = 0x1U << epnum;`
`1253`	`1253`	`atomic_clr_u32(&USBx_DEVICE->DIEPEMPMSK, fifoemptymsk);`
Original file line number	Diff line number	Diff line change
`@@ -1311,7 +1311,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1311`	`1311`	`{`
`1312`	`1312`	`USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;`
`1313`	`1313`	`USB_OTG_EPTypeDef *ep;`
`1314`		`- int32_t len = 0U;`
	`1314`	`+ uint32_t len;`
`1315`	`1315`	`uint32_t len32b;`
`1316`	`1316`	`uint32_t fifoemptymsk = 0U;`
`1317`	`1317`
`@@ -1345,7 +1345,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1345`	`1345`	`ep->xfer_count += len;`
`1346`	`1346`	`}`
`1347`	`1347`
`1348`		`- if(len <= 0U)`
	`1348`	`+ if (ep->xfer_count >= ep->xfer_len)`
`1349`	`1349`	`{`
`1350`	`1350`	`fifoemptymsk = 0x1U << epnum;`
`1351`	`1351`	`/* MBED */`
Original file line number	Diff line number	Diff line change
`@@ -1428,7 +1428,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1428`	`1428`	`{`
`1429`	`1429`	`USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;`
`1430`	`1430`	`USB_OTG_EPTypeDef *ep = NULL;`
`1431`		`- int32_t len = 0U;`
	`1431`	`+ uint32_t len;`
`1432`	`1432`	`uint32_t len32b = 0;`
`1433`	`1433`	`uint32_t fifoemptymsk = 0;`
`1434`	`1434`
`@@ -1462,7 +1462,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1462`	`1462`	`ep->xfer_count += len;`
`1463`	`1463`	`}`
`1464`	`1464`
`1465`		`- if(len <= 0)`
	`1465`	`+ if (ep->xfer_count >= ep->xfer_len)`
`1466`	`1466`	`{`
`1467`	`1467`	`fifoemptymsk = 0x1 << epnum;`
`1468`	`1468`	`// Added for MBED PR #3062`