Skip to content

Commit abc6247

Browse files
biwenlimmahadevan108
authored andcommitted
mcux-sdk-ng: drivers: irqsteer_1: fix build errors
Fix build errors, - drivers/irqsteer_1/fsl_irqsteer.h:187:56: error: pointer of type void * used in arithmetic [-Werror=pointer-arith] Signed-off-by: Biwen Li <[email protected]>
1 parent 1255d8b commit abc6247

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

mcux/mcux-sdk-ng/drivers/irqsteer_1/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# Copyright 2024 NXP
1+
# Copyright 2024-2025 NXP
22
#
33
# SPDX-License-Identifier: BSD-3-Clause
44

55
if(CONFIG_MCUX_COMPONENT_driver.irqsteer_1)
6-
mcux_component_version(2.0.1)
6+
mcux_component_version(2.0.2)
77

88
mcux_add_source(SOURCES fsl_irqsteer.h fsl_irqsteer.c)
99

mcux/mcux-sdk-ng/drivers/irqsteer_1/fsl_irqsteer.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void IRQSTEER_Init(int32_t instIdx)
7878
/* Mask all interrupts. */
7979
for (i = 0; i < data->regNum; i++)
8080
{
81-
*(volatile uint32_t *)(data->infoPtr->reg + IRQSTEER_CHAN_MASK(data->infoPtr->irqChanIdx, i, data->regNum)) = 0U;
81+
*(volatile uint32_t *)((uint32_t)data->infoPtr->reg + IRQSTEER_CHAN_MASK(data->infoPtr->irqChanIdx, i, data->regNum)) = 0U;
8282
}
8383

8484
for (i = 0; i < data->intGrpNum; i++)
@@ -135,7 +135,7 @@ void IRQSTEER_EnableInterrupt(int32_t instIdx, IRQn_Type irq)
135135
regIdx = IRQSTEER_GEN_REG_IDX(data->regNum, inputIdx);
136136
bitOffset = inputIdx % IRQSTEER_INT_SRC_REG_WIDTH;
137137

138-
*(volatile uint32_t *)(data->infoPtr->reg + IRQSTEER_CHAN_MASK(data->infoPtr->irqChanIdx, regIdx, data->regNum)) |= (1U << bitOffset);
138+
*(volatile uint32_t *)((uint32_t)data->infoPtr->reg + IRQSTEER_CHAN_MASK(data->infoPtr->irqChanIdx, regIdx, data->regNum)) |= (1U << bitOffset);
139139
}
140140

141141
/*! @} */
@@ -161,7 +161,7 @@ void IRQSTEER_DisableInterrupt(int32_t instIdx, IRQn_Type irq)
161161
regIdx = IRQSTEER_GEN_REG_IDX(data->regNum, inputIdx);
162162
bitOffset = inputIdx % IRQSTEER_INT_SRC_REG_WIDTH;
163163

164-
*(volatile uint32_t *)(data->infoPtr->reg + IRQSTEER_CHAN_MASK(data->infoPtr->irqChanIdx, regIdx, data->regNum)) &= ~(1U << bitOffset);
164+
*(volatile uint32_t *)((uint32_t)data->infoPtr->reg + IRQSTEER_CHAN_MASK(data->infoPtr->irqChanIdx, regIdx, data->regNum)) &= ~(1U << bitOffset);
165165
}
166166

167167
/**
@@ -266,7 +266,7 @@ IRQn_Type IRQSTEER_GetMasterNextInterrupt(int32_t instIdx, int32_t outputChanIdx
266266
regIdx = IRQSTEER_GetRegIdx(instIdx, outputChanIdx, i);
267267

268268
/* Get register's value */
269-
chanStatus = *(uint32_t *)(data->infoPtr->reg + IRQSTEER_CHAN_STATUS(data->infoPtr->irqChanIdx, regIdx, data->regNum));
269+
chanStatus = *(uint32_t *)((uint32_t)data->infoPtr->reg + IRQSTEER_CHAN_STATUS(data->infoPtr->irqChanIdx, regIdx, data->regNum));
270270

271271
for (j = 0; j < IRQSTEER_INT_SRC_REG_WIDTH; j++)
272272
{
@@ -283,7 +283,7 @@ IRQn_Type IRQSTEER_GetMasterNextInterrupt(int32_t instIdx, int32_t outputChanIdx
283283
*/
284284
idx = (data->regNum - 1) - regIdx;
285285
inputIdx = idx * IRQSTEER_INT_SRC_REG_WIDTH + bitOffset;
286-
irqNum = inputIdx + FSL_FEATURE_IRQSTEER_IRQ_START_INDEX;
286+
irqNum = (IRQn_Type)(inputIdx + FSL_FEATURE_IRQSTEER_IRQ_START_INDEX);
287287
return irqNum;
288288
}
289289

@@ -315,7 +315,7 @@ uint64_t IRQSTEER_GetMasterInterruptsStatus(int32_t instIdx, int32_t outputChanI
315315
for (i = 0; i < sliceNum; i++) {
316316
regIdx = IRQSTEER_GetRegIdx(instIdx, outputChanIdx, i);
317317

318-
chanStatus = *(uint32_t *)(data->infoPtr->reg + IRQSTEER_CHAN_STATUS(data->infoPtr->irqChanIdx, regIdx, data->regNum));
318+
chanStatus = *(uint32_t *)((uint32_t)data->infoPtr->reg + IRQSTEER_CHAN_STATUS(data->infoPtr->irqChanIdx, regIdx, data->regNum));
319319

320320
interrupts |= ((uint64_t)chanStatus << (IRQSTEER_INT_SRC_REG_WIDTH * i));
321321
}

mcux/mcux-sdk-ng/drivers/irqsteer_1/fsl_irqsteer.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
/*! @name Driver version */
2323
/*! @{ */
24-
/*! Version 2.0.1. */
25-
#define FSL_IRQSTEER_DRIVER_VERSION (MAKE_VERSION(2, 0, 1))
24+
/*! Version 2.0.2. */
25+
#define FSL_IRQSTEER_DRIVER_VERSION (MAKE_VERSION(2, 0, 2))
2626
/*! @} */
2727

2828
/*
@@ -184,7 +184,7 @@ static inline bool IRQSTEER_InterruptIsEnabled(int32_t instIdx, IRQn_Type irq)
184184
regIdx = IRQSTEER_GEN_REG_IDX(data->regNum, inputIdx);
185185
bitOffset = inputIdx % IRQSTEER_INT_SRC_REG_WIDTH;
186186

187-
return ((*(volatile uint32_t *)(data->infoPtr->reg + IRQSTEER_CHAN_MASK(data->infoPtr->irqChanIdx, regIdx, data->regNum)) &= (1U << bitOffset)) != 0U);
187+
return ((*(volatile uint32_t *)((uint32_t)data->infoPtr->reg + IRQSTEER_CHAN_MASK(data->infoPtr->irqChanIdx, regIdx, data->regNum)) &= (1U << bitOffset)) != 0U);
188188
}
189189

190190
/*!
@@ -210,11 +210,11 @@ static inline void IRQSTEER_SetInterrupt(int32_t instIdx, IRQn_Type irq, bool se
210210

211211
if (set)
212212
{
213-
*(volatile uint32_t *)(data->infoPtr->reg + IRQSTEER_CHAN_SET(data->infoPtr->irqChanIdx, regIdx, data->regNum)) |= (1U << bitOffset);
213+
*(volatile uint32_t *)((uint32_t)data->infoPtr->reg + IRQSTEER_CHAN_SET(data->infoPtr->irqChanIdx, regIdx, data->regNum)) |= (1U << bitOffset);
214214
}
215215
else
216216
{
217-
*(volatile uint32_t *)(data->infoPtr->reg + IRQSTEER_CHAN_SET(data->infoPtr->irqChanIdx, regIdx, data->regNum)) &= ~(1U << bitOffset);
217+
*(volatile uint32_t *)((uint32_t)data->infoPtr->reg + IRQSTEER_CHAN_SET(data->infoPtr->irqChanIdx, regIdx, data->regNum)) &= ~(1U << bitOffset);
218218
}
219219
}
220220

@@ -233,7 +233,7 @@ static inline void IRQSTEER_SetInterrupt(int32_t instIdx, IRQn_Type irq, bool se
233233
static inline void IRQSTEER_EnableMasterInterrupt(int32_t instIdx, int32_t outputChanIdx)
234234
{
235235
irqsteer_data_t *data = IRQSTEER_GetIrqsteerData(instIdx);
236-
*(volatile uint32_t *)(data->infoPtr->reg + IRQSTEER_CHAN_MINTDIS(data->infoPtr->irqChanIdx, data->regNum)) &= ~(1U << outputChanIdx);
236+
*(volatile uint32_t *)((uint32_t)data->infoPtr->reg + IRQSTEER_CHAN_MINTDIS(data->infoPtr->irqChanIdx, data->regNum)) &= ~(1U << outputChanIdx);
237237
}
238238

239239
/*!
@@ -251,7 +251,7 @@ static inline void IRQSTEER_EnableMasterInterrupt(int32_t instIdx, int32_t outpu
251251
static inline void IRQSTEER_DisableMasterInterrupt(int32_t instIdx, int32_t outputChanIdx)
252252
{
253253
irqsteer_data_t *data = IRQSTEER_GetIrqsteerData(instIdx);
254-
*(volatile uint32_t *)(data->infoPtr->reg + IRQSTEER_CHAN_MINTDIS(data->infoPtr->irqChanIdx, data->regNum)) |= (1U << outputChanIdx);
254+
*(volatile uint32_t *)((uint32_t)data->infoPtr->reg + IRQSTEER_CHAN_MINTDIS(data->infoPtr->irqChanIdx, data->regNum)) |= (1U << outputChanIdx);
255255
}
256256

257257
/*! @} */
@@ -286,7 +286,7 @@ static inline bool IRQSTEER_IsInterruptSet(int32_t instIdx, IRQn_Type irq)
286286
regIdx = IRQSTEER_GEN_REG_IDX(data->regNum, inputIdx);
287287
bitOffset = inputIdx % IRQSTEER_INT_SRC_REG_WIDTH;
288288

289-
return *(volatile uint32_t *)(data->infoPtr->reg + IRQSTEER_CHAN_STATUS(data->infoPtr->irqChanIdx, regIdx, data->regNum)) & (1U << bitOffset);
289+
return *(volatile uint32_t *)((uint32_t)data->infoPtr->reg + IRQSTEER_CHAN_STATUS(data->infoPtr->irqChanIdx, regIdx, data->regNum)) & (1U << bitOffset);
290290
}
291291

292292
/*!
@@ -301,7 +301,7 @@ static inline bool IRQSTEER_IsMasterInterruptSet(int32_t instIdx)
301301
{
302302
irqsteer_data_t *data = IRQSTEER_GetIrqsteerData(instIdx);
303303

304-
return *(volatile uint32_t *)(data->infoPtr->reg + IRQSTEER_CHAN_MSTRSTAT(data->infoPtr->irqChanIdx, data->regNum));
304+
return *(volatile uint32_t *)((uint32_t)data->infoPtr->reg + IRQSTEER_CHAN_MSTRSTAT(data->infoPtr->irqChanIdx, data->regNum));
305305
}
306306

307307
/*!

0 commit comments

Comments
 (0)