Skip to content

Commit ad55bc2

Browse files
bcostmbcostm
committed
STM32: Remove GCC_ARM compilation warnings
1 parent 20d93bf commit ad55bc2

File tree

11 files changed

+62
-68
lines changed

11 files changed

+62
-68
lines changed

‎targets/TARGET_STM/TARGET_STM32F0/serial_device.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -478,9 +478,7 @@ void serial_clear(serial_t *obj)
478478
void serial_break_set(serial_t *obj)
479479
{
480480
struct serial_s *obj_s = SERIAL_S(obj);
481-
UART_HandleTypeDef *huart = &uart_handlers[obj_s->index];
482-
483-
//HAL_LIN_SendBreak(huart);
481+
UART_HandleTypeDef *huart __attribute__((unused)) = &uart_handlers[obj_s->index];
484482
}
485483

486484
#if DEVICE_SERIAL_ASYNCH
@@ -798,9 +796,9 @@ int serial_irq_handler_asynch(serial_t *obj)
798796
HAL_UART_IRQHandler(huart);
799797

800798
// Abort if an error occurs
801-
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
802-
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
803-
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
799+
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
800+
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
801+
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
804802
return return_event;
805803
}
806804

@@ -874,8 +872,7 @@ void serial_rx_abort_asynch(serial_t *obj)
874872

875873
// clear flags
876874
__HAL_UART_CLEAR_FLAG(huart, UART_CLEAR_PEF | UART_CLEAR_FEF | UART_CLEAR_OREF);
877-
volatile uint32_t tmpval = huart->Instance->RDR; // Clear RXNE flag
878-
UNUSED(tmpval);
875+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear RXNE flag
879876

880877
// reset states
881878
huart->RxXferCount = 0;

‎targets/TARGET_STM/TARGET_STM32F1/serial_device.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ static void uart_irq(int id)
172172
}
173173
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
174174
if (__HAL_UART_GET_IT_SOURCE(huart, UART_IT_ERR) != RESET) {
175-
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
175+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
176176
}
177177
}
178178
}
@@ -542,13 +542,13 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {
542542

543543
void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
544544
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_PE) != RESET) {
545-
volatile uint32_t tmpval = huart->Instance->DR; // Clear PE flag
545+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear PE flag
546546
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_FE) != RESET) {
547-
volatile uint32_t tmpval = huart->Instance->DR; // Clear FE flag
547+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear FE flag
548548
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_NE) != RESET) {
549-
volatile uint32_t tmpval = huart->Instance->DR; // Clear NE flag
549+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear NE flag
550550
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
551-
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
551+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
552552
}
553553
}
554554

@@ -599,9 +599,9 @@ int serial_irq_handler_asynch(serial_t *obj)
599599
HAL_UART_IRQHandler(huart);
600600

601601
// Abort if an error occurs
602-
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
603-
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
604-
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
602+
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
603+
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
604+
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
605605
return return_event;
606606
}
607607

@@ -675,7 +675,7 @@ void serial_rx_abort_asynch(serial_t *obj)
675675

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

680680
// reset states
681681
huart->RxXferCount = 0;

‎targets/TARGET_STM/TARGET_STM32F2/serial_device.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ static void uart_irq(int id)
259259
}
260260
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
261261
if (__HAL_UART_GET_IT_SOURCE(huart, USART_IT_ERR) != RESET) {
262-
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
262+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
263263
}
264264
}
265265
}
@@ -720,13 +720,13 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {
720720

721721
void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
722722
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_PE) != RESET) {
723-
volatile uint32_t tmpval = huart->Instance->DR; // Clear PE flag
723+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear PE flag
724724
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_FE) != RESET) {
725-
volatile uint32_t tmpval = huart->Instance->DR; // Clear FE flag
725+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear FE flag
726726
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_NE) != RESET) {
727-
volatile uint32_t tmpval = huart->Instance->DR; // Clear NE flag
727+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear NE flag
728728
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
729-
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
729+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
730730
}
731731
}
732732

@@ -777,9 +777,9 @@ int serial_irq_handler_asynch(serial_t *obj)
777777
HAL_UART_IRQHandler(huart);
778778

779779
// Abort if an error occurs
780-
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
781-
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
782-
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
780+
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
781+
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
782+
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
783783
return return_event;
784784
}
785785

@@ -853,7 +853,7 @@ void serial_rx_abort_asynch(serial_t *obj)
853853

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

858858
// reset states
859859
huart->RxXferCount = 0;

‎targets/TARGET_STM/TARGET_STM32F3/serial_device.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -697,9 +697,9 @@ int serial_irq_handler_asynch(serial_t *obj)
697697
HAL_UART_IRQHandler(huart);
698698

699699
// Abort if an error occurs
700-
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
701-
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
702-
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
700+
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
701+
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
702+
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
703703
return return_event;
704704
}
705705

@@ -773,8 +773,7 @@ void serial_rx_abort_asynch(serial_t *obj)
773773

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

779778
// reset states
780779
huart->RxXferCount = 0;

‎targets/TARGET_STM/TARGET_STM32F4/serial_device.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ static void uart_irq(int id)
286286
}
287287
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
288288
if (__HAL_UART_GET_IT_SOURCE(huart, USART_IT_ERR) != RESET) {
289-
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
289+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
290290
}
291291
}
292292
}
@@ -782,13 +782,13 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {
782782

783783
void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
784784
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_PE) != RESET) {
785-
volatile uint32_t tmpval = huart->Instance->DR; // Clear PE flag
785+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear PE flag
786786
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_FE) != RESET) {
787-
volatile uint32_t tmpval = huart->Instance->DR; // Clear FE flag
787+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear FE flag
788788
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_NE) != RESET) {
789-
volatile uint32_t tmpval = huart->Instance->DR; // Clear NE flag
789+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear NE flag
790790
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
791-
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
791+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
792792
}
793793
}
794794

@@ -839,9 +839,9 @@ int serial_irq_handler_asynch(serial_t *obj)
839839
HAL_UART_IRQHandler(huart);
840840

841841
// Abort if an error occurs
842-
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
843-
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
844-
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
842+
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
843+
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
844+
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
845845
return return_event;
846846
}
847847

@@ -915,7 +915,7 @@ void serial_rx_abort_asynch(serial_t *obj)
915915

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

920920
// reset states
921921
huart->RxXferCount = 0;

‎targets/TARGET_STM/TARGET_STM32F7/serial_device.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -763,9 +763,9 @@ int serial_irq_handler_asynch(serial_t *obj)
763763
HAL_UART_IRQHandler(huart);
764764

765765
// Abort if an error occurs
766-
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
767-
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
768-
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
766+
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
767+
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
768+
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
769769
return return_event;
770770
}
771771

@@ -838,7 +838,7 @@ void serial_rx_abort_asynch(serial_t *obj)
838838
__HAL_UART_DISABLE_IT(huart, UART_IT_ERR);
839839

840840
// clear flags
841-
volatile uint32_t tmpval = huart->Instance->RDR; // Clear RXNE
841+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear RXNE
842842
__HAL_UART_CLEAR_IT(huart, UART_CLEAR_PEF);
843843
__HAL_UART_CLEAR_IT(huart, UART_CLEAR_FEF);
844844
__HAL_UART_CLEAR_IT(huart, UART_CLEAR_NEF);

‎targets/TARGET_STM/TARGET_STM32L0/flash_api.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ static int32_t flash_lock(void)
5757

5858
int32_t flash_erase_sector(flash_t *obj, uint32_t address)
5959
{
60-
uint32_t FirstPage = 0;
6160
uint32_t PAGEError = 0;
6261
FLASH_EraseInitTypeDef EraseInitStruct;
6362
int32_t status = 0;

‎targets/TARGET_STM/TARGET_STM32L0/serial_device.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -673,9 +673,9 @@ int serial_irq_handler_asynch(serial_t *obj)
673673
HAL_UART_IRQHandler(huart);
674674

675675
// Abort if an error occurs
676-
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
677-
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
678-
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
676+
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
677+
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
678+
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
679679
return return_event;
680680
}
681681

@@ -749,7 +749,7 @@ void serial_rx_abort_asynch(serial_t *obj)
749749

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

754754
// reset states
755755
huart->RxXferCount = 0;

‎targets/TARGET_STM/TARGET_STM32L1/flash_api.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ static int32_t flash_lock(void)
5757

5858
int32_t flash_erase_sector(flash_t *obj, uint32_t address)
5959
{
60-
uint32_t FirstPage = 0;
6160
uint32_t PAGEError = 0;
6261
FLASH_EraseInitTypeDef EraseInitStruct;
6362
int32_t status = 0;

‎targets/TARGET_STM/TARGET_STM32L1/serial_device.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static void uart_irq(int id)
203203
}
204204
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
205205
if (__HAL_UART_GET_IT_SOURCE(huart, UART_IT_ERR) != RESET) {
206-
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
206+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
207207
}
208208
}
209209
}
@@ -607,13 +607,13 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {
607607

608608
void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
609609
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_PE) != RESET) {
610-
volatile uint32_t tmpval = huart->Instance->DR; // Clear PE flag
610+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear PE flag
611611
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_FE) != RESET) {
612-
volatile uint32_t tmpval = huart->Instance->DR; // Clear FE flag
612+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear FE flag
613613
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_NE) != RESET) {
614-
volatile uint32_t tmpval = huart->Instance->DR; // Clear NE flag
614+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear NE flag
615615
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
616-
volatile uint32_t tmpval = huart->Instance->DR; // Clear ORE flag
616+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->DR; // Clear ORE flag
617617
}
618618
}
619619

@@ -664,9 +664,9 @@ int serial_irq_handler_asynch(serial_t *obj)
664664
HAL_UART_IRQHandler(huart);
665665

666666
// Abort if an error occurs
667-
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
668-
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
669-
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
667+
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
668+
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
669+
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
670670
return return_event;
671671
}
672672

@@ -740,7 +740,7 @@ void serial_rx_abort_asynch(serial_t *obj)
740740

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

745745
// reset states
746746
huart->RxXferCount = 0;

‎targets/TARGET_STM/TARGET_STM32L4/serial_device.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ static void uart_irq(int id)
230230
}
231231
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
232232
if (__HAL_UART_GET_IT(huart, UART_IT_ORE) != RESET) {
233-
volatile uint32_t tmpval = huart->Instance->RDR; // Clear ORE flag
233+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear ORE flag
234234
}
235235
}
236236
}
@@ -659,13 +659,13 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {
659659

660660
void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
661661
if (__HAL_UART_GET_FLAG(huart, UART_FLAG_PE) != RESET) {
662-
volatile uint32_t tmpval = huart->Instance->RDR; // Clear PE flag
662+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear PE flag
663663
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_FE) != RESET) {
664-
volatile uint32_t tmpval = huart->Instance->RDR; // Clear FE flag
664+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear FE flag
665665
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_NE) != RESET) {
666-
volatile uint32_t tmpval = huart->Instance->RDR; // Clear NE flag
666+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear NE flag
667667
} else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_ORE) != RESET) {
668-
volatile uint32_t tmpval = huart->Instance->RDR; // Clear ORE flag
668+
volatile uint32_t tmpval __attribute__((unused)) = huart->Instance->RDR; // Clear ORE flag
669669
}
670670
}
671671

@@ -716,9 +716,9 @@ int serial_irq_handler_asynch(serial_t *obj)
716716
HAL_UART_IRQHandler(huart);
717717

718718
// Abort if an error occurs
719-
if (return_event & SERIAL_EVENT_RX_PARITY_ERROR ||
720-
return_event & SERIAL_EVENT_RX_FRAMING_ERROR ||
721-
return_event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
719+
if ((return_event & SERIAL_EVENT_RX_PARITY_ERROR) ||
720+
(return_event & SERIAL_EVENT_RX_FRAMING_ERROR) ||
721+
(return_event & SERIAL_EVENT_RX_OVERRUN_ERROR)) {
722722
return return_event;
723723
}
724724

@@ -792,7 +792,7 @@ void serial_rx_abort_asynch(serial_t *obj)
792792

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

797797
// reset states
798798
huart->RxXferCount = 0;

0 commit comments

Comments
 (0)