Drop usage of ilen, just use len and cast it to int32_t as appropriate

Paul Thompson · Paul Thompson · commit 2211a27f53d7 · 2018-04-13T00:27:00.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
@@ -1301,15 +1301,13 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
   USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;
   USB_OTG_EPTypeDef *ep;
   uint32_t len;
-  int32_t ilen;
   uint32_t len32b;
   uint32_t fifoemptymsk = 0;
 
   ep = &hpcd->IN_ep[epnum];
-  ilen = ep->xfer_len - ep->xfer_count;
-  len = ilen;
+  len = ep->xfer_len - ep->xfer_count;
 
-  if ((ilen > 0) && (len > ep->maxpacket))
+  if (((int32_t)len > 0) && (len > ep->maxpacket))
   {
     len = ep->maxpacket;
   }
@@ -1322,10 +1320,9 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
             ep->xfer_len != 0)
   {
     /* Write the FIFO */
-    ilen = ep->xfer_len - ep->xfer_count;
-    len = ilen;
+    len = ep->xfer_len - ep->xfer_count;
 
-    if ((ilen > 0) && (len > ep->maxpacket))
+    if (((int32_t)len > 0) && (len > ep->maxpacket))
     {
       len = ep->maxpacket;
     }
@@ -1337,7 +1334,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t
     ep->xfer_count += len;
   }
 
-  if(ilen <= 0)
+  if ((int32_t)len <= 0)
   {
     fifoemptymsk = 0x1 << epnum;
     atomic_clr_u32(&USBx_DEVICE->DIEPEMPMSK,  fifoemptymsk); // MBED: changed

Original file line number	Diff line number	Diff line change
`@@ -1301,15 +1301,13 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1301`	`1301`	`USB_OTG_GlobalTypeDef *USBx = hpcd->Instance;`
`1302`	`1302`	`USB_OTG_EPTypeDef *ep;`
`1303`	`1303`	`uint32_t len;`
`1304`		`- int32_t ilen;`
`1305`	`1304`	`uint32_t len32b;`
`1306`	`1305`	`uint32_t fifoemptymsk = 0;`
`1307`	`1306`
`1308`	`1307`	`ep = &hpcd->IN_ep[epnum];`
`1309`		`- ilen = ep->xfer_len - ep->xfer_count;`
`1310`		`- len = ilen;`
	`1308`	`+ len = ep->xfer_len - ep->xfer_count;`
`1311`	`1309`
`1312`		`- if ((ilen > 0) && (len > ep->maxpacket))`
	`1310`	`+ if (((int32_t)len > 0) && (len > ep->maxpacket))`
`1313`	`1311`	`{`
`1314`	`1312`	`len = ep->maxpacket;`
`1315`	`1313`	`}`
`@@ -1322,10 +1320,9 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1322`	`1320`	`ep->xfer_len != 0)`
`1323`	`1321`	`{`
`1324`	`1322`	`/* Write the FIFO */`
`1325`		`- ilen = ep->xfer_len - ep->xfer_count;`
`1326`		`- len = ilen;`
	`1323`	`+ len = ep->xfer_len - ep->xfer_count;`
`1327`	`1324`
`1328`		`- if ((ilen > 0) && (len > ep->maxpacket))`
	`1325`	`+ if (((int32_t)len > 0) && (len > ep->maxpacket))`
`1329`	`1326`	`{`
`1330`	`1327`	`len = ep->maxpacket;`
`1331`	`1328`	`}`
`@@ -1337,7 +1334,7 @@ static HAL_StatusTypeDef PCD_WriteEmptyTxFifo(PCD_HandleTypeDef *hpcd, uint32_t`
`1337`	`1334`	`ep->xfer_count += len;`
`1338`	`1335`	`}`
`1339`	`1336`
`1340`		`- if(ilen <= 0)`
	`1337`	`+ if ((int32_t)len <= 0)`
`1341`	`1338`	`{`
`1342`	`1339`	`fifoemptymsk = 0x1 << epnum;`
`1343`	`1340`	`atomic_clr_u32(&USBx_DEVICE->DIEPEMPMSK, fifoemptymsk); // MBED: changed`