Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-11-16 12:34:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

bsps/tqm8xx: Fix integer expression warnings

Browse Source 
Make sure we work with unsigned integer interrupt numbers.

Update #5378.
This commit is contained in:
Sebastian Huber
2025-10-29 05:02:11 +01:00
parent ed38fadfbe
commit 2770bed227
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
bsps/powerpc/tqm8xx/include/bsp/irq.h
View File

@@ -51,30 +51,29 @@
/*
* Peripheral IRQ handlers related definitions
*/
#define BSP_SIU_PER_IRQ_NUMBER 16
#define BSP_SIU_IRQ_LOWEST_OFFSET 0
#define BSP_SIU_PER_IRQ_NUMBER 16U
#define BSP_SIU_IRQ_LOWEST_OFFSET 0U
#define BSP_SIU_IRQ_MAX_OFFSET (BSP_SIU_IRQ_LOWEST_OFFSET\
+BSP_SIU_PER_IRQ_NUMBER-1)
+BSP_SIU_PER_IRQ_NUMBER-1U)
#define BSP_IS_SIU_IRQ(irqnum) \
(((irqnum) >= BSP_SIU_IRQ_LOWEST_OFFSET) && \
((irqnum) <= BSP_SIU_IRQ_MAX_OFFSET))
#define BSP_IS_SIU_IRQ(irqnum) \
(((unsigned)(irqnum) - BSP_SIU_IRQ_LOWEST_OFFSET) < BSP_SIU_PER_IRQ_NUMBER)
#define BSP_CPM_PER_IRQ_NUMBER 32
#define BSP_CPM_IRQ_LOWEST_OFFSET (BSP_SIU_IRQ_MAX_OFFSET+1)
#define BSP_CPM_PER_IRQ_NUMBER 32U
#define BSP_CPM_IRQ_LOWEST_OFFSET (BSP_SIU_IRQ_MAX_OFFSET+1U)
#define BSP_CPM_IRQ_MAX_OFFSET (BSP_CPM_IRQ_LOWEST_OFFSET\
+BSP_CPM_PER_IRQ_NUMBER-1)
+BSP_CPM_PER_IRQ_NUMBER-1U)
#define BSP_IS_CPM_IRQ(irqnum) \
(((unsigned)(irqnum) - BSP_CPM_IRQ_LOWEST_OFFSET) < BSP_CPM_PER_IRQ_NUMBER)
#define BSP_IS_CPM_IRQ(irqnum) \
(((irqnum) >= BSP_CPM_IRQ_LOWEST_OFFSET) && \
((irqnum) <= BSP_CPM_IRQ_MAX_OFFSET))
/*
* Processor IRQ handlers related definitions
*/
#define BSP_PROCESSOR_IRQ_NUMBER 1
#define BSP_PROCESSOR_IRQ_LOWEST_OFFSET (BSP_CPM_IRQ_MAX_OFFSET+1)
#define BSP_PROCESSOR_IRQ_NUMBER 1U
#define BSP_PROCESSOR_IRQ_LOWEST_OFFSET (BSP_CPM_IRQ_MAX_OFFSET+1U)
#define BSP_PROCESSOR_IRQ_MAX_OFFSET (BSP_PROCESSOR_IRQ_LOWEST_OFFSET\
+BSP_PROCESSOR_IRQ_NUMBER-1)
+BSP_PROCESSOR_IRQ_NUMBER-1U)
#define BSP_IS_PROCESSOR_IRQ(irqnum) \
(((irqnum) >= BSP_PROCESSOR_IRQ_LOWEST_OFFSET) && \
@@ -82,7 +81,7 @@
/*
* Summary
*/
#define BSP_IRQ_NUMBER (BSP_PROCESSOR_IRQ_MAX_OFFSET+1)
#define BSP_IRQ_NUMBER (BSP_PROCESSOR_IRQ_MAX_OFFSET+1U)
#define BSP_LOWEST_OFFSET BSP_SIU_IRQ_LOWEST_OFFSET
#define BSP_MAX_OFFSET BSP_PROCESSOR_IRQ_MAX_OFFSET
@@ -159,7 +158,7 @@ extern "C" {
#define BSP_PERIODIC_TIMER BSP_SIU_INT_IRQ_6
#define BSP_FAST_ETHERNET_CTRL BSP_SIU_INT_IRQ_3
#define BSP_INTERRUPT_VECTOR_COUNT (BSP_MAX_OFFSET + 1)
#define BSP_INTERRUPT_VECTOR_COUNT (BSP_MAX_OFFSET + 1U)
extern int BSP_irq_enabled_at_cpm(const rtems_irq_number irqLine);

4
bsps/powerpc/tqm8xx/irq/irq.c
View File

@@ -242,7 +242,7 @@ static int BSP_irq_handle_at_siu( unsigned excNum)
* if this is the CPM interrupt, mask lower prio interrupts at SIU
* else mask lower and same priority interrupts
*/
m8xx.simask &= ~0 << (32
m8xx.simask &= ~0U << (32
- sivecnum
- ((is_cpm_irq) ? 1 : 0));
@@ -259,7 +259,7 @@ static int BSP_irq_handle_at_siu( unsigned excNum)
/*
* clear pending bit, if edge triggered interrupt input
*/
m8xx.sipend = 1 << (31 - sivecnum);
m8xx.sipend = 1U << (31 - sivecnum);
}