Make the atomic_clr_u32 conditional use raw values rather than computed, remove need for guards

Paul Thompson · Paul Thompson · commit b45d4233e11f · 2018-04-13T04:44:43.000-07:00
diff --git a/targets/TARGET_STM/TARGET_STM32F7/device/stm32f7xx_hal_pcd.c b/targets/TARGET_STM/TARGET_STM32F7/device/stm32f7xx_hal_pcd.c
@@ -1307,7 +1307,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
   ep = &hpcd->IN_ep[epnum];
   len = ep->xfer_len - ep->xfer_count;
 
-  if (((int32_t)len > 0) && (len > ep->maxpacket))
+  if (len > ep->maxpacket)
   {
     len = ep->maxpacket;
   }
@@ -1322,7 +1322,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
     /* Write the FIFO */
     len = ep->xfer_len - ep->xfer_count;
 
-    if (((int32_t)len > 0) && (len > ep->maxpacket))
+    if (len > ep->maxpacket)
     {
       len = ep->maxpacket;
     }
@@ -1334,7 +1334,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
     ep->xfer_count += len;
   }
 
-  if ((int32_t)len <= 0)
+  if (ep->xfer_count >= ep->xfer_len)
   {
     fifoemptymsk = 0x1 << epnum;
     atomic_clr_u32(&USBx_DEVICE->DIEPEMPMSK,  fifoemptymsk); // MBED: changed

Original file line number	Diff line number	Diff line change
`@@ -1307,7 +1307,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1307`	`1307`	`ep = &hpcd->IN_ep[epnum];`
`1308`	`1308`	`len = ep->xfer_len - ep->xfer_count;`
`1309`	`1309`
`1310`		`- if (((int32_t)len > 0) && (len > ep->maxpacket))`
	`1310`	`+ if (len > ep->maxpacket)`
`1311`	`1311`	`{`
`1312`	`1312`	`len = ep->maxpacket;`
`1313`	`1313`	`}`
`@@ -1322,7 +1322,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1322`	`1322`	`/* Write the FIFO */`
`1323`	`1323`	`len = ep->xfer_len - ep->xfer_count;`
`1324`	`1324`
`1325`		`- if (((int32_t)len > 0) && (len > ep->maxpacket))`
	`1325`	`+ if (len > ep->maxpacket)`
`1326`	`1326`	`{`
`1327`	`1327`	`len = ep->maxpacket;`
`1328`	`1328`	`}`
`@@ -1334,7 +1334,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1334`	`1334`	`ep->xfer_count += len;`
`1335`	`1335`	`}`
`1336`	`1336`
`1337`		`- if ((int32_t)len <= 0)`
	`1337`	`+ if (ep->xfer_count >= ep->xfer_len)`
`1338`	`1338`	`{`
`1339`	`1339`	`fifoemptymsk = 0x1 << epnum;`
`1340`	`1340`	`atomic_clr_u32(&USBx_DEVICE->DIEPEMPMSK, fifoemptymsk); // MBED: changed`