Skip to content

STM32: Remove compilation warnings #5327

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 3 commits into from
Oct 26, 2017
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
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,6 @@ void ETH_IRQHandler(void)
*/
static void _eth_arch_low_level_init(struct netif *netif)
{
uint32_t regvalue = 0;
HAL_StatusTypeDef hal_eth_init_status;

/* Init ETH */
uint8_t MACAddr[6];
EthHandle.Instance = ETH;
Expand All @@ -119,7 +116,7 @@ static void _eth_arch_low_level_init(struct netif *netif)
EthHandle.Init.RxMode = ETH_RXINTERRUPT_MODE;
EthHandle.Init.ChecksumMode = ETH_CHECKSUM_BY_HARDWARE;
EthHandle.Init.MediaInterface = ETH_MEDIA_INTERFACE_RMII;
hal_eth_init_status = HAL_ETH_Init(&EthHandle);
HAL_ETH_Init(&EthHandle);

/* Initialize Tx Descriptors list: Chain Mode */
HAL_ETH_DMATxDescListInit(&EthHandle, DMATxDscrTab, &Tx_Buff[0][0], ETH_TXBUFNB);
Expand Down
13 changes: 5 additions & 8 deletions targets/TARGET_STM/TARGET_STM32F0/serial_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -478,9 +478,7 @@ void serial_clear(serial_t *obj)
void serial_break_set(serial_t *obj)
{
struct serial_s *obj_s = SERIAL_S(obj);
UART_HandleTypeDef *huart = &uart_handlers[obj_s->index];

//HAL_LIN_SendBreak(huart);
UART_HandleTypeDef *huart __attribute__((unused)) = &uart_handlers[obj_s->index];
}

#if DEVICE_SERIAL_ASYNCH
Expand Down Expand Up @@ -798,9 +796,9 @@ int serial_irq_handler_asynch(serial_t *obj)
HAL_UART_IRQHandler(huart);

// Abort if an error occurs
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
return return_event;
}

Expand Down Expand Up @@ -874,8 +872,7 @@ void serial_rx_abort_asynch(serial_t *obj)

// clear flags
__HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_PEF | UART_CLEAR_FEF | UART_CLEAR_OREF);
volatile uint32_t tmpval = huart->Instance->RDR; // Clear RXNE flag
UNUSED(tmpval);
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear RXNE flag

// reset states
huart->RxXferCount = 0;
Expand Down
18 changes: 9 additions & 9 deletions targets/TARGET_STM/TARGET_STM32F1/serial_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ static void uart_irq(int id)
}
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
if (__HAL_UART_GET_IT_SOURCE(huart, UART_IT_ERR) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
}
}
}
Expand Down Expand Up @@ -542,13 +542,13 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {

void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_PE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear PE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear PE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_FE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear FE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear FE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_NE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear NE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear NE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
}
}

Expand Down Expand Up @@ -599,9 +599,9 @@ int serial_irq_handler_asynch(serial_t *obj)
HAL_UART_IRQHandler(huart);

// Abort if an error occurs
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
return return_event;
}

Expand Down Expand Up @@ -675,7 +675,7 @@ void serial_rx_abort_asynch(serial_t *obj)

// clear flags
__HAL_UART_CLEAR_FLAG(huart, UART_FLAG_RXNE);
volatile uint32_t tmpval = huart->Instance->DR; // Clear errors flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear errors flag

// reset states
huart->RxXferCount = 0;
Expand Down
18 changes: 9 additions & 9 deletions targets/TARGET_STM/TARGET_STM32F2/serial_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ static void uart_irq(int id)
}
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
if (__HAL_UART_GET_IT_SOURCE(huart, USART_IT_ERR) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
}
}
}
Expand Down Expand Up @@ -720,13 +720,13 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {

void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_PE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear PE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear PE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_FE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear FE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear FE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_NE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear NE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear NE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
}
}

Expand Down Expand Up @@ -777,9 +777,9 @@ int serial_irq_handler_asynch(serial_t *obj)
HAL_UART_IRQHandler(huart);

// Abort if an error occurs
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
return return_event;
}

Expand Down Expand Up @@ -853,7 +853,7 @@ void serial_rx_abort_asynch(serial_t *obj)

// clear flags
__HAL_UART_CLEAR_FLAG(huart, UART_FLAG_RXNE);
volatile uint32_t tmpval = huart->Instance->DR; // Clear error flags
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear error flags

// reset states
huart->RxXferCount = 0;
Expand Down
9 changes: 4 additions & 5 deletions targets/TARGET_STM/TARGET_STM32F3/serial_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -697,9 +697,9 @@ int serial_irq_handler_asynch(serial_t *obj)
HAL_UART_IRQHandler(huart);

// Abort if an error occurs
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
return return_event;
}

Expand Down Expand Up @@ -773,8 +773,7 @@ void serial_rx_abort_asynch(serial_t *obj)

// clear flags
__HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_PEF | UART_CLEAR_FEF | UART_CLEAR_OREF);
volatile uint32_t tmpval = huart->Instance->RDR; // Clear RXNE flag
UNUSED(tmpval);
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear RXNE flag

// reset states
huart->RxXferCount = 0;
Expand Down
18 changes: 9 additions & 9 deletions targets/TARGET_STM/TARGET_STM32F4/serial_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ static void uart_irq(int id)
}
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
if (__HAL_UART_GET_IT_SOURCE(huart, USART_IT_ERR) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
}
}
}
Expand Down Expand Up @@ -782,13 +782,13 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {

void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_PE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear PE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear PE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_FE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear FE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear FE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_NE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear NE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear NE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
}
}

Expand Down Expand Up @@ -839,9 +839,9 @@ int serial_irq_handler_asynch(serial_t *obj)
HAL_UART_IRQHandler(huart);

// Abort if an error occurs
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
return return_event;
}

Expand Down Expand Up @@ -915,7 +915,7 @@ void serial_rx_abort_asynch(serial_t *obj)

// clear flags
__HAL_UART_CLEAR_FLAG(huart, UART_FLAG_RXNE);
volatile uint32_t tmpval = huart->Instance->DR; // Clear errors flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear errors flag

// reset states
huart->RxXferCount = 0;
Expand Down
8 changes: 4 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F7/serial_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -763,9 +763,9 @@ int serial_irq_handler_asynch(serial_t *obj)
HAL_UART_IRQHandler(huart);

// Abort if an error occurs
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
return return_event;
}

Expand Down Expand Up @@ -838,7 +838,7 @@ void serial_rx_abort_asynch(serial_t *obj)
__HAL_UART_DISABLE_IT(huart, UART_IT_ERR);

// clear flags
volatile uint32_t tmpval = huart->Instance->RDR; // Clear RXNE
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear RXNE
__HAL_UART_CLEAR_IT(huart, UART_CLEAR_PEF);
__HAL_UART_CLEAR_IT(huart, UART_CLEAR_FEF);
__HAL_UART_CLEAR_IT(huart, UART_CLEAR_NEF);
Expand Down
1 change: 0 additions & 1 deletion targets/TARGET_STM/TARGET_STM32L0/flash_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ static int32_t flash_lock(void)

int32_t flash_erase_sector(flash_t *obj, uint32_t address)
{
uint32_t FirstPage = 0;
uint32_t PAGEError = 0;
FLASH_EraseInitTypeDef EraseInitStruct;
int32_t status = 0;
Expand Down
8 changes: 4 additions & 4 deletions targets/TARGET_STM/TARGET_STM32L0/serial_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -673,9 +673,9 @@ int serial_irq_handler_asynch(serial_t *obj)
HAL_UART_IRQHandler(huart);

// Abort if an error occurs
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
return return_event;
}

Expand Down Expand Up @@ -749,7 +749,7 @@ void serial_rx_abort_asynch(serial_t *obj)

// clear flags
__HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_PEF | UART_CLEAR_FEF | UART_CLEAR_OREF);
volatile uint32_t tmpval = huart->Instance->RDR; // Clear RXNE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear RXNE flag

// reset states
huart->RxXferCount = 0;
Expand Down
1 change: 0 additions & 1 deletion targets/TARGET_STM/TARGET_STM32L1/flash_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ static int32_t flash_lock(void)

int32_t flash_erase_sector(flash_t *obj, uint32_t address)
{
uint32_t FirstPage = 0;
uint32_t PAGEError = 0;
FLASH_EraseInitTypeDef EraseInitStruct;
int32_t status = 0;
Expand Down
18 changes: 9 additions & 9 deletions targets/TARGET_STM/TARGET_STM32L1/serial_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ static void uart_irq(int id)
}
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
if (__HAL_UART_GET_IT_SOURCE(huart, UART_IT_ERR) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
}
}
}
Expand Down Expand Up @@ -607,13 +607,13 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {

void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_PE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear PE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear PE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_FE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear FE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear FE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_NE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear NE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear NE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
}
}

Expand Down Expand Up @@ -664,9 +664,9 @@ int serial_irq_handler_asynch(serial_t *obj)
HAL_UART_IRQHandler(huart);

// Abort if an error occurs
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
return return_event;
}

Expand Down Expand Up @@ -740,7 +740,7 @@ void serial_rx_abort_asynch(serial_t *obj)

// clear flags
__HAL_UART_CLEAR_FLAG(huart, UART_FLAG_RXNE);
volatile uint32_t tmpval = huart->Instance->DR; // Clear errors flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear errors flag

// reset states
huart->RxXferCount = 0;
Expand Down
18 changes: 9 additions & 9 deletions targets/TARGET_STM/TARGET_STM32L4/serial_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ static void uart_irq(int id)
}
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
if (__HAL_UART_GET_IT(huart, UART_IT_ORE) != RESET) {
volatile uint32_t tmpval = huart->Instance->RDR; // Clear ORE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear ORE flag
}
}
}
Expand Down Expand Up @@ -659,13 +659,13 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {

void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_PE) != RESET) {
volatile uint32_t tmpval = huart->Instance->RDR; // Clear PE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear PE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_FE) != RESET) {
volatile uint32_t tmpval = huart->Instance->RDR; // Clear FE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear FE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_NE) != RESET) {
volatile uint32_t tmpval = huart->Instance->RDR; // Clear NE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear NE flag
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
volatile uint32_t tmpval = huart->Instance->RDR; // Clear ORE flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear ORE flag
}
}

Expand Down Expand Up @@ -716,9 +716,9 @@ int serial_irq_handler_asynch(serial_t *obj)
HAL_UART_IRQHandler(huart);

// Abort if an error occurs
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
return return_event;
}

Expand Down Expand Up @@ -792,7 +792,7 @@ void serial_rx_abort_asynch(serial_t *obj)

// clear flags
__HAL_UART_CLEAR_FLAG(huart, UART_FLAG_RXNE);
volatile uint32_t tmpval = huart->Instance->RDR; // Clear errors flag
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear errors flag

// reset states
huart->RxXferCount = 0;
Expand Down
Loading