Skip to content

STM32 ETH : remove TX RX locking interrupt perforation #6948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions targets/TARGET_STM/TARGET_STM32F1/device/stm32f1xx_hal_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
{
uint32_t bufcount = 0U, size = 0U, i = 0U;

/* Process Locked */
__HAL_LOCK(heth);

/* Set the ETH peripheral state to BUSY */
heth->State = HAL_ETH_STATE_BUSY;

Expand All @@ -668,9 +665,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
/* Set ETH HAL state to READY */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

return HAL_ERROR;
}

Expand All @@ -680,9 +674,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
/* OWN bit set */
heth->State = HAL_ETH_STATE_BUSY_TX;

/* Process Unlocked */
__HAL_UNLOCK(heth);

return HAL_ERROR;
}

Expand Down Expand Up @@ -753,9 +744,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
/* Set ETH HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_OK;
}
Expand All @@ -770,9 +758,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
{
uint32_t framelength = 0U;

/* Process Locked */
__HAL_LOCK(heth);

/* Check the ETH state to BUSY */
heth->State = HAL_ETH_STATE_BUSY;

Expand Down Expand Up @@ -806,9 +791,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
/* Set HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_OK;
}
Expand All @@ -833,9 +815,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
/* Set ETH HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_ERROR;
}
Expand All @@ -850,9 +829,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
{
uint32_t descriptorscancounter = 0U;

/* Process Locked */
__HAL_LOCK(heth);

/* Set ETH HAL State to BUSY */
heth->State = HAL_ETH_STATE_BUSY;

Expand Down Expand Up @@ -907,9 +883,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
/* Set HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_OK;
}
Expand All @@ -918,9 +891,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
/* Set HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_ERROR;
}
Expand Down
30 changes: 0 additions & 30 deletions targets/TARGET_STM/TARGET_STM32F2/device/stm32f2xx_hal_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -663,9 +663,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
{
uint32_t bufcount = 0U, size = 0U, i = 0U;

/* Process Locked */
__HAL_LOCK(heth);

/* Set the ETH peripheral state to BUSY */
heth->State = HAL_ETH_STATE_BUSY;

Expand All @@ -674,9 +671,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
/* Set ETH HAL state to READY */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

return HAL_ERROR;
}

Expand All @@ -686,9 +680,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
/* OWN bit set */
heth->State = HAL_ETH_STATE_BUSY_TX;

/* Process Unlocked */
__HAL_UNLOCK(heth);

return HAL_ERROR;
}

Expand Down Expand Up @@ -759,9 +750,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
/* Set ETH HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_OK;
}
Expand All @@ -776,9 +764,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
{
uint32_t framelength = 0U;

/* Process Locked */
__HAL_LOCK(heth);

/* Check the ETH state to BUSY */
heth->State = HAL_ETH_STATE_BUSY;

Expand Down Expand Up @@ -812,9 +797,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
/* Set HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_OK;
}
Expand All @@ -839,9 +821,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
/* Set ETH HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_ERROR;
}
Expand All @@ -856,9 +835,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
{
uint32_t descriptorscancounter = 0U;

/* Process Locked */
__HAL_LOCK(heth);

/* Set ETH HAL State to BUSY */
heth->State = HAL_ETH_STATE_BUSY;

Expand Down Expand Up @@ -913,9 +889,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
/* Set HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_OK;
}
Expand All @@ -924,9 +897,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
/* Set HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_ERROR;
}
Expand Down
30 changes: 0 additions & 30 deletions targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -670,9 +670,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
{
uint32_t bufcount = 0U, size = 0U, i = 0U;

/* Process Locked */
__HAL_LOCK(heth);

/* Set the ETH peripheral state to BUSY */
heth->State = HAL_ETH_STATE_BUSY;

Expand All @@ -681,9 +678,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
/* Set ETH HAL state to READY */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

return HAL_ERROR;
}

Expand All @@ -693,9 +687,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
/* OWN bit set */
heth->State = HAL_ETH_STATE_BUSY_TX;

/* Process Unlocked */
__HAL_UNLOCK(heth);

return HAL_ERROR;
}

Expand Down Expand Up @@ -766,9 +757,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
/* Set ETH HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_OK;
}
Expand All @@ -783,9 +771,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
{
uint32_t framelength = 0U;

/* Process Locked */
__HAL_LOCK(heth);

/* Check the ETH state to BUSY */
heth->State = HAL_ETH_STATE_BUSY;

Expand Down Expand Up @@ -819,9 +804,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
/* Set HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_OK;
}
Expand All @@ -846,9 +828,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
/* Set ETH HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_ERROR;
}
Expand All @@ -863,9 +842,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
{
uint32_t descriptorscancounter = 0U;

/* Process Locked */
__HAL_LOCK(heth);

/* Set ETH HAL State to BUSY */
heth->State = HAL_ETH_STATE_BUSY;

Expand Down Expand Up @@ -920,9 +896,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
/* Set HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_OK;
}
Expand All @@ -931,9 +904,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
/* Set HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_ERROR;
}
Expand Down
9 changes: 0 additions & 9 deletions targets/TARGET_STM/TARGET_STM32F7/device/stm32f7xx_hal_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -814,9 +814,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
/* Set HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_OK;
}
Expand All @@ -841,9 +838,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
/* Set ETH HAL State to Ready */
heth->State = HAL_ETH_STATE_READY;

/* Process Unlocked */
__HAL_UNLOCK(heth);

/* Return function status */
return HAL_ERROR;
}
Expand All @@ -858,9 +852,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
{
uint32_t descriptorscancounter = 0;

/* Process Locked */
__HAL_LOCK(heth);

/* Set ETH HAL State to BUSY */
heth->State = HAL_ETH_STATE_BUSY;

Expand Down