Skip to content
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

ext/hal/st/stm32cube/stm32l1xx: rename SVC_IRQn -> SVCall_IRQn #15744

Merged
merged 1 commit into from
Apr 30, 2019

Conversation

frantony
Copy link
Contributor

SVCall_IRQn is used as enum value for SV Call Interrupt for Cortex-M
based SoCs for which CPU_CORTEX_M_HAS_BASEPRI=y. However stm32cube
for stm32l1xx uses SVC_IRQn enum value for this purpose.
This leads to this error:

  arch/arm/include/cortex_m/exc.h:101:19: error: 'SVCall_IRQn'
    undeclared (first use in this function); did you mean 'SVC_IRQn'?

    NVIC_SetPriority(SVCall_IRQn, _EXC_SVC_PRIO);
                     ^~~~~~~~~~~
                     SVC_IRQn

NB: ext/hal/st/stm32cube/stm32l1xx/soc/stm32l151xb.h file was already
fixed in 9f82604 ('ext: hal: st: stm32cube: Add HAL for the STM32L1x series').

SVCall_IRQn is used as enum value for SV Call Interrupt for Cortex-M
based SoCs for which CPU_CORTEX_M_HAS_BASEPRI=y. However stm32cube
for stm32l1xx uses SVC_IRQn enum value for this purpose.
This leads to this error:

  arch/arm/include/cortex_m/exc.h:101:19: error: 'SVCall_IRQn'
    undeclared (first use in this function); did you mean 'SVC_IRQn'?

    NVIC_SetPriority(SVCall_IRQn, _EXC_SVC_PRIO);
                     ^~~~~~~~~~~
                     SVC_IRQn

NB: ext/hal/st/stm32cube/stm32l1xx/soc/stm32l151xb.h file was already
fixed in 9f82604 ('ext: hal: st: stm32cube: Add HAL for
the STM32L1x series').

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
@nashif nashif added EXT Has change or related to ext/ (obsolete) platform: STM32 ST Micro STM32 labels Apr 29, 2019
@nashif nashif requested a review from erwango April 29, 2019 20:50
@erwango
Copy link
Member

erwango commented Apr 30, 2019

Thanks for submitting.

NB: ext/hal/st/stm32cube/stm32l1xx/soc/stm32l151xb.h file was already
fixed in 9f82604 ('ext: hal: st: stm32cube: Add HAL for the STM32L1x series').

Sorry if this was not clear but please fix them all at once in current PR.

Copy link
Member

@erwango erwango left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add fix for stm32l151xb.h

@frantony
Copy link
Contributor Author

@erwango

Add fix for stm32l151xb.h

The ext/hal/st/stm32cube/stm32l1xx/soc/stm32l151xb.h file was already
fixed in 9f82604 ('ext: hal: st: stm32cube: Add HAL for the STM32L1x series').

The commit 9f82604 is already merged into the master.

I can't fix it if it is already fixed!

I can make PR with two commits:

  • the first commit reverts fix of ext/hal/st/stm32cube/stm32l1xx/soc/stm32l151xb.h;
  • the second commit fix all header files in ext/hal/st/stm32cube/stm32l1xx/soc/ at once.

The problem is that the first commit will break 96b_wistrio board.

@frantony frantony force-pushed the stm32l1-svcall-irqn branch from fbb9993 to 94ace28 Compare April 30, 2019 08:55
@erwango
Copy link
Member

erwango commented Apr 30, 2019

@frantony, thanks for clarification and my bad then. Twice my bad, since I reviewed and approved L1 porting.

Thanks for your proposal, but let's do it simple:
Just add the required changes to extend the fix to the whole series.
Main point is that it is documented in README as you just did.
This is only temporary as hopefully cube package will be fixed and updated in a reasonable time frame.

@frantony frantony force-pushed the stm32l1-svcall-irqn branch from 94ace28 to fbb9993 Compare April 30, 2019 12:21
@frantony
Copy link
Contributor Author

@frantony

Just add the required changes to extend the fix to the whole series.
Main point is that it is documented in README as you just did.

I have just done it.

@erwango erwango requested a review from galak April 30, 2019 12:54
@galak galak merged commit 43c4c9c into zephyrproject-rtos:master Apr 30, 2019
@frantony frantony deleted the stm32l1-svcall-irqn branch May 7, 2019 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
EXT Has change or related to ext/ (obsolete) platform: STM32 ST Micro STM32
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants