MKLZ25Z.h revisions: Where's my NVIC gone?

[raels-r]

I've just joined a team entering the Freescale Cup, but have hit a snag with the example code: it was built in Codewarrior using rev1.5 processor headers from 2012-11-22.

Unfortunately KDS, which I'd like to use for this project, uses rev2.5 headers, which have changed quite a bit.
I've been correcting some of the definition changes, but I can't for the life of me figure out where the NVIC and SCB definitions have gone!

According to my current KDS compile errors, I need to find:

'SCB_VTOR'

'SCB_SCR'

'SCB_SCR'

'SCB_SCR_SLEEPDEEP_MASK'

'SCB_SCR_SLEEPDEEP_MASK'

'NVIC_ICPR'

'NVIC_ICER'

I've attached the new and old header files to help, if anyone can point out what the definitions have changed to to help me better understand the new naming system it'd be greatly appreciated!

Cheers,
Rael S-R

Original Attachment has been moved to: MKL25Z4(rev2.5).h.zip

Original Attachment has been moved to: MKL25Z4(rev1.5).h.zip

[raels-r · Accepted solution]

So I have discovered some NVIC and SCB definitions in "core_cm0plus.h" (around line 600), which is #included in the MKL25Z header.

It seems now that all NVIC and SCB definitions are now in a structure, so the following translations are used:

Old	New
'SCB_VTOR'	SCB->VTOR
'SCB_SCR'	SCB->SCR
'SCB_SCR_SLEEPDEEP_MASK'	SCB_SCR_SLEEPDEEP_Msk
'NVIC_ICPR'	NVIC->ICPR
'NVIC_ICER'	NVIC->ICER

I hope this helps anyone who gets stuck with these new definitions like I was!